mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: dsa: Factor bottom tag receive functions

Browse source 
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>
This commit is contained in:
Florian Fainelli 2017-04-08 08:55:23 -07:00 committed by David S. Miller
parent 16c5dcb13a
commit a86d8becc3
9 changed files with 53 additions and 84 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
include/net/dsa.h
View file

@ -124,7 +124,7 @@ struct dsa_switch_tree {
* protocol to use. * protocol to use.
*/ */
struct net_device *master_netdev; struct net_device *master_netdev;
int (*rcv)(struct sk_buff *skb, struct sk_buff * (*rcv)(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev,
struct packet_type *pt, struct packet_type *pt,
struct net_device *orig_dev); struct net_device *orig_dev);

20
net/dsa/dsa.c
View file

@ -23,6 +23,7 @@
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/phy_fixed.h> #include <linux/phy_fixed.h>
#include <linux/gpio/consumer.h> #include <linux/gpio/consumer.h>
#include <linux/etherdevice.h>
#include <net/dsa.h> #include <net/dsa.h>
#include "dsa_priv.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 packet_type *pt, struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct sk_buff *nskb = NULL;
if (unlikely(dst == NULL)) { if (unlikely(dst == NULL)) {
kfree_skb(skb); kfree_skb(skb);
@ -910,7 +912,23 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
if (!skb) if (!skb)
return 0; 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 = { static struct packet_type dsa_pack_type __read_mostly = {

5
net/dsa/dsa_priv.h
View file

@ -17,8 +17,9 @@
struct dsa_device_ops { struct dsa_device_ops {
struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev); struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev);
int (*rcv)(struct sk_buff *skb, struct net_device *dev, struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev); struct packet_type *pt,
struct net_device *orig_dev);
}; };
struct dsa_slave_priv { struct dsa_slave_priv {

18
net/dsa/tag_brcm.c
View file

@ -92,8 +92,9 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, struct net_device *dev
return NULL; return NULL;
} }
static int brcm_tag_rcv(struct sk_buff *skb, struct net_device *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 packet_type *pt,
struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds; 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, skb->data - ETH_HLEN - BRCM_TAG_LEN,
2 * ETH_ALEN); 2 * ETH_ALEN);
skb_push(skb, ETH_HLEN);
skb->pkt_type = PACKET_HOST;
skb->dev = ds->ports[source_port].netdev; skb->dev = ds->ports[source_port].netdev;
skb->protocol = eth_type_trans(skb, skb->dev);
skb->dev->stats.rx_packets++; return skb;
skb->dev->stats.rx_bytes += skb->len;
netif_receive_skb(skb);
return 0;
out_drop: out_drop:
kfree_skb(skb); return NULL;
return 0;
} }
const struct dsa_device_ops brcm_netdev_ops = { const struct dsa_device_ops brcm_netdev_ops = {

18
net/dsa/tag_dsa.c
View file

@ -68,8 +68,9 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev)
return NULL; return NULL;
} }
static int dsa_rcv(struct sk_buff *skb, struct net_device *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 packet_type *pt,
struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds; 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->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++; return skb;
skb->dev->stats.rx_bytes += skb->len;
netif_receive_skb(skb);
return 0;
out_drop: out_drop:
kfree_skb(skb); return NULL;
return 0;
} }
const struct dsa_device_ops dsa_netdev_ops = { const struct dsa_device_ops dsa_netdev_ops = {

18
net/dsa/tag_edsa.c
View file

@ -81,8 +81,9 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev)
return NULL; return NULL;
} }
static int edsa_rcv(struct sk_buff *skb, struct net_device *dev, static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev) struct packet_type *pt,
struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds; struct dsa_switch *ds;
@ -177,20 +178,11 @@ static int edsa_rcv(struct sk_buff *skb, struct net_device *dev,
} }
skb->dev = ds->ports[source_port].netdev; 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++; return skb;
skb->dev->stats.rx_bytes += skb->len;
netif_receive_skb(skb);
return 0;
out_drop: out_drop:
kfree_skb(skb); return NULL;
return 0;
} }
const struct dsa_device_ops edsa_netdev_ops = { const struct dsa_device_ops edsa_netdev_ops = {

20
net/dsa/tag_mtk.c
View file

@ -47,8 +47,9 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,
return NULL; return NULL;
} }
static int mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev, static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev) struct packet_type *pt,
struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds; struct dsa_switch *ds;
@ -85,23 +86,12 @@ static int mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
if (!ds->ports[port].netdev) if (!ds->ports[port].netdev)
goto out_drop; goto out_drop;
/* Update skb & forward the frame accordingly */
skb_push(skb, ETH_HLEN);
skb->pkt_type = PACKET_HOST;
skb->dev = ds->ports[port].netdev; skb->dev = ds->ports[port].netdev;
skb->protocol = eth_type_trans(skb, skb->dev);
skb->dev->stats.rx_packets++; return skb;
skb->dev->stats.rx_bytes += skb->len;
netif_receive_skb(skb);
return 0;
out_drop: out_drop:
kfree_skb(skb); return NULL;
return 0;
} }
const struct dsa_device_ops mtk_netdev_ops = { const struct dsa_device_ops mtk_netdev_ops = {

18
net/dsa/tag_qca.c
View file

@ -66,8 +66,9 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)
return NULL; return NULL;
} }
static int qca_tag_rcv(struct sk_buff *skb, struct net_device *dev, static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev) struct packet_type *pt,
struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds; struct dsa_switch *ds;
@ -108,21 +109,12 @@ static int qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
goto out_drop; goto out_drop;
/* Update skb & forward the frame accordingly */ /* Update skb & forward the frame accordingly */
skb_push(skb, ETH_HLEN);
skb->pkt_type = PACKET_HOST;
skb->dev = ds->ports[port].netdev; skb->dev = ds->ports[port].netdev;
skb->protocol = eth_type_trans(skb, skb->dev);
skb->dev->stats.rx_packets++; return skb;
skb->dev->stats.rx_bytes += skb->len;
netif_receive_skb(skb);
return 0;
out_drop: out_drop:
kfree_skb(skb); return NULL;
return 0;
} }
const struct dsa_device_ops qca_netdev_ops = { const struct dsa_device_ops qca_netdev_ops = {

18
net/dsa/tag_trailer.c
View file

@ -58,8 +58,9 @@ static struct sk_buff *trailer_xmit(struct sk_buff *skb, struct net_device *dev)
return nskb; return nskb;
} }
static int trailer_rcv(struct sk_buff *skb, struct net_device *dev, static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev,
struct packet_type *pt, struct net_device *orig_dev) struct packet_type *pt,
struct net_device *orig_dev)
{ {
struct dsa_switch_tree *dst = dev->dsa_ptr; struct dsa_switch_tree *dst = dev->dsa_ptr;
struct dsa_switch *ds; struct dsa_switch *ds;
@ -83,20 +84,11 @@ static int trailer_rcv(struct sk_buff *skb, struct net_device *dev,
pskb_trim_rcsum(skb, skb->len - 4); pskb_trim_rcsum(skb, skb->len - 4);
skb->dev = ds->ports[source_port].netdev; 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++; return skb;
skb->dev->stats.rx_bytes += skb->len;
netif_receive_skb(skb);
return 0;
out_drop: out_drop:
kfree_skb(skb); return NULL;
return 0;
} }
const struct dsa_device_ops trailer_netdev_ops = { const struct dsa_device_ops trailer_netdev_ops = {