bonding: move processing of recv handlers into handle_frame()

Since now when bonding uses rx_handler, all traffic going into bond
device goes thru bond_handle_frame. So there's no need to go back into
bonding code later via ptype handlers. This patch converts
original ptype handlers into "bonding receive probes". These functions
are called from bond_handle_frame and they are registered per-mode.

Note that vlan packets are also handled because they are always untagged
thanks to vlan_untag()

Note that this also allows arpmon for eth-bond-bridge-vlan topology.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 24 deletions

diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 123dd602261f..d0981c2ffbda 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -2465,35 +2465,16 @@ out:
         return NETDEV_TX_OK;
 }
 
-int bond_3ad_lacpdu_recv(struct sk_buff *skb, struct net_device *dev, struct packet_type* ptype, struct net_device *orig_dev)
+void bond_3ad_lacpdu_recv(struct sk_buff *skb, struct bonding *bond,
+                          struct slave *slave)
 {
-        struct bonding *bond = netdev_priv(dev);
-        struct slave *slave = NULL;
-        int ret = NET_RX_DROP;
-
-        if (!(dev->flags & IFF_MASTER))
-                goto out;
-
-        skb = skb_share_check(skb, GFP_ATOMIC);
-        if (!skb)
-                goto out;
+        if (skb->protocol != PKT_TYPE_LACPDU)
+                return;
 
         if (!pskb_may_pull(skb, sizeof(struct lacpdu)))
-                goto out;
+                return;
 
         read_lock(&bond->lock);
-        slave = bond_get_slave_by_dev(netdev_priv(dev), orig_dev);
-        if (!slave)
-                goto out_unlock;
-
         bond_3ad_rx_indication((struct lacpdu *) skb->data, slave, skb->len);
-
-        ret = NET_RX_SUCCESS;
-
-out_unlock:
         read_unlock(&bond->lock);
-out:
-        dev_kfree_skb(skb);
-
-        return ret;
 }