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

bonding: 3ad: remove bond_3ad_rx_indication's length argument 



Since the received lacpdu is accessed via skb_header_pointer() in
bond_3ad_lacpdu_recv() we no longer need to check for skb->len's length.
If the returned lacpdu pointer is not null that should be enough.

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

drivers/net/bonding/bond_3ad.c

+2 −7
Original line number Diff line number Diff line
@@ -2348,22 +2348,17 @@ re_arm: 
 * bond_3ad_rx_indication - handle a received frame

 * @lacpdu: received lacpdu

 * @slave: slave struct to work on

 * @length: length of the data received

 *

 * It is assumed that frames that were sent on this NIC don't returned as new

 * received frames (loopback). Since only the payload is given to this

 * function, it check for loopback.

 */

static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave,

				  u16 length)

static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave)

{

	int ret = RX_HANDLER_ANOTHER;

	struct bond_marker *marker;

	struct port *port;



	if (length < sizeof(struct lacpdu))

		return ret;



	port = &(SLAVE_AD_INFO(slave)->port);

	if (!port->slave) {

		net_warn_ratelimited("%s: Warning: port of slave %s is uninitialized\n",
@@ -2643,7 +2638,7 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond, 
	if (!lacpdu)

		return RX_HANDLER_ANOTHER;



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

	return bond_3ad_rx_indication(lacpdu, slave);

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE