net: dsa: Factor bottom tag receive functions

All DSA tag receive functions do strictly the same thing after they have located
the originating source port from their tag specific protocol:

- push ETH_HLEN bytes
- set pkt_type to PACKET_HOST
- call eth_type_trans()
- bump up counters
- call netif_receive_skb()

Factor all of that into dsa_switch_rcv(). This also makes us return a pointer to
a sk_buff, which makes us symetric with the xmit function.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 19 insertions, 1 deletions

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index d370c8bfa372..1fb9cf7aaaf4 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -23,6 +23,7 @@
 #include <linux/sysfs.h>
 #include <linux/phy_fixed.h>
 #include <linux/gpio/consumer.h>
+#include <linux/etherdevice.h>
 #include <net/dsa.h>
 #include "dsa_priv.h"
 
@@ -900,6 +901,7 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
                           struct packet_type *pt, struct net_device *orig_dev)
 {
         struct dsa_switch_tree *dst = dev->dsa_ptr;
+        struct sk_buff *nskb = NULL;
 
         if (unlikely(dst == NULL)) {
                 kfree_skb(skb);
@@ -910,7 +912,23 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
         if (!skb)
                 return 0;
 
-        return dst->rcv(skb, dev, pt, orig_dev);
+        nskb = dst->rcv(skb, dev, pt, orig_dev);
+        if (!nskb) {
+                kfree_skb(skb);
+                return 0;
+        }
+
+        skb = nskb;
+        skb_push(skb, ETH_HLEN);
+        skb->pkt_type = PACKET_HOST;
+        skb->protocol = eth_type_trans(skb, skb->dev);
+
+        skb->dev->stats.rx_packets++;
+        skb->dev->stats.rx_bytes += skb->len;
+
+        netif_receive_skb(skb);
+
+        return 0;
 }
 
 static struct packet_type dsa_pack_type __read_mostly = {