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

Commit 86e74986 authored by Nikolay Aleksandrov's avatar Nikolay Aleksandrov Committed by David S. Miller
Browse files

bonding: 3ad: clean up curr_slave_lock usage 



Remove the read_lock in bond_3ad_lacpdu_recv() since when the slave is
being released its rx_handler is removed before 3ad unbind, so even if
packets arrive, they won't see the slave in an inconsistent state.

Signed-off-by: default avatarNikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b25bd251

drivers/net/bonding/bond_3ad.c

+3 −7
Original line number Diff line number Diff line
@@ -2476,20 +2476,16 @@ err_free: 
int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,

			 struct slave *slave)

{

	int ret = RX_HANDLER_ANOTHER;

	struct lacpdu *lacpdu, _lacpdu;



	if (skb->protocol != PKT_TYPE_LACPDU)

		return ret;

		return RX_HANDLER_ANOTHER;



	lacpdu = skb_header_pointer(skb, 0, sizeof(_lacpdu), &_lacpdu);

	if (!lacpdu)

		return ret;

		return RX_HANDLER_ANOTHER;



	read_lock(&bond->curr_slave_lock);

	ret = bond_3ad_rx_indication(lacpdu, slave, skb->len);

	read_unlock(&bond->curr_slave_lock);

	return ret;

	return bond_3ad_rx_indication(lacpdu, slave, skb->len);

}



/**