OSDN Git Service

bonding: 3ad: remove bond_3ad_rx_indication's length argument
authorNikolay Aleksandrov <nikolay@cumulusnetworks.com>
Fri, 18 Jan 2019 12:30:21 +0000 (14:30 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 22 Jan 2019 20:04:14 +0000 (12:04 -0800)
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: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_3ad.c

index cdc43ee..d8ef235 100644 (file)
@@ -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);
 }
 
 /**