Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a86d8bec authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 16c5dcb1

include/net/dsa.h

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ struct dsa_switch_tree { 
	 * protocol to use.

	 */

	struct net_device	*master_netdev;

	int			(*rcv)(struct sk_buff *skb,

	struct sk_buff *	(*rcv)(struct sk_buff *skb,

				       struct net_device *dev,

				       struct packet_type *pt,

				       struct net_device *orig_dev);

net/dsa/dsa.c

+19 −1
Original line number Diff line number Diff line
@@ -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 = {

net/dsa/dsa_priv.h

+3 −2
Original line number Diff line number Diff line
@@ -17,8 +17,9 @@ 


struct dsa_device_ops {

	struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);

	int (*rcv)(struct sk_buff *skb, struct net_device *dev,

		   struct packet_type *pt, struct net_device *orig_dev);

	struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,

			       struct packet_type *pt,

			       struct net_device *orig_dev);

};



struct dsa_slave_priv {

net/dsa/tag_brcm.c

+5 −13
Original line number Diff line number Diff line
@@ -92,8 +92,9 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, struct net_device *dev 
	return NULL;

}



static int brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev,

			struct packet_type *pt, struct net_device *orig_dev)

static struct sk_buff *brcm_tag_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 dsa_switch *ds;
@@ -133,21 +134,12 @@ static int brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev, 
		skb->data - ETH_HLEN - BRCM_TAG_LEN,

		2 * ETH_ALEN);



	skb_push(skb, ETH_HLEN);

	skb->pkt_type = PACKET_HOST;

	skb->dev = ds->ports[source_port].netdev;

	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;

	return skb;



out_drop:

	kfree_skb(skb);

	return 0;

	return NULL;

}



const struct dsa_device_ops brcm_netdev_ops = {

net/dsa/tag_dsa.c

+5 −13
Original line number Diff line number Diff line
@@ -68,8 +68,9 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev) 
	return NULL;

}



static int dsa_rcv(struct sk_buff *skb, struct net_device *dev,

		   struct packet_type *pt, struct net_device *orig_dev)

static struct sk_buff *dsa_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 dsa_switch *ds;
@@ -158,20 +159,11 @@ static int dsa_rcv(struct sk_buff *skb, struct net_device *dev, 
	}



	skb->dev = ds->ports[source_port].netdev;

	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;

	return skb;



out_drop:

	kfree_skb(skb);

	return 0;

	return NULL;

}



const struct dsa_device_ops dsa_netdev_ops = {