bridge: switch order of rx_handler reg and upper dev link
authorJiri Pirko <jiri@resnulli.us>
Fri, 5 Sep 2014 13:51:28 +0000 (15:51 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 9 Sep 2014 18:29:54 +0000 (11:29 -0700)
commit0f49579a39533bf839b2af807b094fc652f9e49b
tree2f3e7d978d92767ec7f3894f52f714ce7f8ab92f
parent49a601589caaf0e93194c0cc9b4ecddbe75dd2d5
bridge: switch order of rx_handler reg and upper dev link

The thing is that netdev_master_upper_dev_link calls
call_netdevice_notifiers(NETDEV_CHANGEUPPER, dev). That generates rtnl
link message and during that, rtnl_link_ops->fill_slave_info is called.
But with current ordering, rx_handler and IFF_BRIDGE_PORT are not set
yet so there would have to be check for that in fill_slave_info callback.

Resolve this by reordering to similar what bonding and team does to
avoid the check.

Also add removal of IFF_BRIDGE_PORT flag into error path.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/bridge/br_if.c