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

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
...@@ -2348,22 +2348,17 @@ void bond_3ad_state_machine_handler(struct work_struct *work) ...@@ -2348,22 +2348,17 @@ void bond_3ad_state_machine_handler(struct work_struct *work)
* bond_3ad_rx_indication - handle a received frame * bond_3ad_rx_indication - handle a received frame
* @lacpdu: received lacpdu * @lacpdu: received lacpdu
* @slave: slave struct to work on * @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 * 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 * received frames (loopback). Since only the payload is given to this
* function, it check for loopback. * function, it check for loopback.
*/ */
static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave, static int bond_3ad_rx_indication(struct lacpdu *lacpdu, struct slave *slave)
u16 length)
{ {
int ret = RX_HANDLER_ANOTHER; int ret = RX_HANDLER_ANOTHER;
struct bond_marker *marker; struct bond_marker *marker;
struct port *port; struct port *port;
if (length < sizeof(struct lacpdu))
return ret;
port = &(SLAVE_AD_INFO(slave)->port); port = &(SLAVE_AD_INFO(slave)->port);
if (!port->slave) { if (!port->slave) {
net_warn_ratelimited("%s: Warning: port of slave %s is uninitialized\n", 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, ...@@ -2643,7 +2638,7 @@ int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond,
if (!lacpdu) if (!lacpdu)
return RX_HANDLER_ANOTHER; return RX_HANDLER_ANOTHER;
return bond_3ad_rx_indication(lacpdu, slave, skb->len); return bond_3ad_rx_indication(lacpdu, slave);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment