From: Jiri Pirko <jiri@resnulli.us>
Date: Fri, 5 Sep 2014 13:51:28 +0000 (+0200)
Subject: bridge: switch order of rx_handler reg and upper dev link
X-Git-Tag: fixes-against-v3.18-rc2~81^2~130^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f49579a39533bf839b2af807b094fc652f9e49b;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed