Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f01561f1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "bridge: inherit slave devices needed_headroom"

parents d02d95a6 342b48e3

net/bridge/br_if.c

+3 −0
Original line number Diff line number Diff line
@@ -382,6 +382,9 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) 


	netdev_update_features(br->dev);



	if (br->dev->needed_headroom < dev->needed_headroom)

		br->dev->needed_headroom = dev->needed_headroom;



	spin_lock_bh(&br->lock);

	changed_addr = br_stp_recalculate_bridge_id(br);