Skip to content

L
linux
Commit 29a097b7 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files
Options

net: dsa: remove the struct packet_type argument from dsa_device_ops::rcv() 

No tagging driver uses this.
Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 35d7a6f1
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 49 deletions
include/net/dsa.h
View file @ 29a097b7
...@@ -79,13 +79,11 @@ enum dsa_tag_protocol { ...@@ -79,13 +79,11 @@ enum dsa_tag_protocol {
DSA_TAG_PROTO_SJA1110 = DSA_TAG_PROTO_SJA1110_VALUE, DSA_TAG_PROTO_SJA1110 = DSA_TAG_PROTO_SJA1110_VALUE,
}; };
struct packet_type;
struct dsa_switch; struct dsa_switch;
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);
struct sk_buff *(*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);
void (*flow_dissect)(const struct sk_buff *skb, __be16 *proto, void (*flow_dissect)(const struct sk_buff *skb, __be16 *proto,
int *offset); int *offset);
unsigned int needed_headroom; unsigned int needed_headroom;
...@@ -239,8 +237,7 @@ struct dsa_port { ...@@ -239,8 +237,7 @@ struct dsa_port {
/* Copies for faster access in master receive hot path */ /* Copies for faster access in master receive hot path */
struct dsa_switch_tree *dst; struct dsa_switch_tree *dst;
struct sk_buff *(*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);
enum { enum {
DSA_PORT_TYPE_UNUSED = 0, DSA_PORT_TYPE_UNUSED = 0,
......
net/dsa/dsa.c
View file @ 29a097b7
...@@ -238,7 +238,7 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev, ...@@ -238,7 +238,7 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
if (!skb) if (!skb)
return 0; return 0;
nskb = cpu_dp->rcv(skb, dev, pt); nskb = cpu_dp->rcv(skb, dev);
if (!nskb) { if (!nskb) {
kfree_skb(skb); kfree_skb(skb);
return 0; return 0;
......
net/dsa/tag_ar9331.c
View file @ 29a097b7
...@@ -44,8 +44,7 @@ static struct sk_buff *ar9331_tag_xmit(struct sk_buff *skb, ...@@ -44,8 +44,7 @@ static struct sk_buff *ar9331_tag_xmit(struct sk_buff *skb,
} }
static struct sk_buff *ar9331_tag_rcv(struct sk_buff *skb, static struct sk_buff *ar9331_tag_rcv(struct sk_buff *skb,
struct net_device *ndev, struct net_device *ndev)
struct packet_type *pt)
{ {
u8 ver, port; u8 ver, port;
u16 hdr; u16 hdr;
......
net/dsa/tag_brcm.c
View file @ 29a097b7
...@@ -136,7 +136,6 @@ static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb, ...@@ -136,7 +136,6 @@ static struct sk_buff *brcm_tag_xmit_ll(struct sk_buff *skb,
*/ */
static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb, static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev,
struct packet_type *pt,
unsigned int offset) unsigned int offset)
{ {
int source_port; int source_port;
...@@ -182,13 +181,12 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb, ...@@ -182,13 +181,12 @@ static struct sk_buff *brcm_tag_xmit(struct sk_buff *skb,
} }
static struct sk_buff *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 sk_buff *nskb; struct sk_buff *nskb;
/* skb->data points to the EtherType, the tag is right before it */ /* skb->data points to the EtherType, the tag is right before it */
nskb = brcm_tag_rcv_ll(skb, dev, pt, 2); nskb = brcm_tag_rcv_ll(skb, dev, 2);
if (!nskb) if (!nskb)
return nskb; return nskb;
...@@ -251,8 +249,7 @@ static struct sk_buff *brcm_leg_tag_xmit(struct sk_buff *skb, ...@@ -251,8 +249,7 @@ static struct sk_buff *brcm_leg_tag_xmit(struct sk_buff *skb,
} }
static struct sk_buff *brcm_leg_tag_rcv(struct sk_buff *skb, static struct sk_buff *brcm_leg_tag_rcv(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev)
struct packet_type *pt)
{ {
int source_port; int source_port;
u8 *brcm_tag; u8 *brcm_tag;
...@@ -302,11 +299,10 @@ static struct sk_buff *brcm_tag_xmit_prepend(struct sk_buff *skb, ...@@ -302,11 +299,10 @@ static struct sk_buff *brcm_tag_xmit_prepend(struct sk_buff *skb,
} }
static struct sk_buff *brcm_tag_rcv_prepend(struct sk_buff *skb, static struct sk_buff *brcm_tag_rcv_prepend(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev)
struct packet_type *pt)
{ {
/* tag is prepended to the packet */ /* tag is prepended to the packet */
return brcm_tag_rcv_ll(skb, dev, pt, ETH_HLEN); return brcm_tag_rcv_ll(skb, dev, ETH_HLEN);
} }
static const struct dsa_device_ops brcm_prepend_netdev_ops = { static const struct dsa_device_ops brcm_prepend_netdev_ops = {
......
net/dsa/tag_dsa.c
View file @ 29a097b7
...@@ -332,8 +332,7 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -332,8 +332,7 @@ static struct sk_buff *dsa_xmit(struct sk_buff *skb, struct net_device *dev)
return dsa_xmit_ll(skb, dev, 0); return dsa_xmit_ll(skb, dev, 0);
} }
static struct sk_buff *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)
{ {
if (unlikely(!pskb_may_pull(skb, DSA_HLEN))) if (unlikely(!pskb_may_pull(skb, DSA_HLEN)))
return NULL; return NULL;
...@@ -373,8 +372,7 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -373,8 +372,7 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev)
return skb; return skb;
} }
static struct sk_buff *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)
{ {
if (unlikely(!pskb_may_pull(skb, EDSA_HLEN))) if (unlikely(!pskb_may_pull(skb, EDSA_HLEN)))
return NULL; return NULL;
......
net/dsa/tag_gswip.c
View file @ 29a097b7
...@@ -75,8 +75,7 @@ static struct sk_buff *gswip_tag_xmit(struct sk_buff *skb, ...@@ -75,8 +75,7 @@ static struct sk_buff *gswip_tag_xmit(struct sk_buff *skb,
} }
static struct sk_buff *gswip_tag_rcv(struct sk_buff *skb, static struct sk_buff *gswip_tag_rcv(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev)
struct packet_type *pt)
{ {
int port; int port;
u8 *gswip_tag; u8 *gswip_tag;
......
net/dsa/tag_hellcreek.c
View file @ 29a097b7
...@@ -29,8 +29,7 @@ static struct sk_buff *hellcreek_xmit(struct sk_buff *skb, ...@@ -29,8 +29,7 @@ static struct sk_buff *hellcreek_xmit(struct sk_buff *skb,
} }
static struct sk_buff *hellcreek_rcv(struct sk_buff *skb, static struct sk_buff *hellcreek_rcv(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev)
struct packet_type *pt)
{ {
/* Tag decoding */ /* Tag decoding */
u8 *tag = skb_tail_pointer(skb) - HELLCREEK_TAG_LEN; u8 *tag = skb_tail_pointer(skb) - HELLCREEK_TAG_LEN;
......
net/dsa/tag_ksz.c
View file @ 29a097b7
...@@ -67,8 +67,7 @@ static struct sk_buff *ksz8795_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -67,8 +67,7 @@ static struct sk_buff *ksz8795_xmit(struct sk_buff *skb, struct net_device *dev)
return skb; return skb;
} }
static struct sk_buff *ksz8795_rcv(struct sk_buff *skb, struct net_device *dev, static struct sk_buff *ksz8795_rcv(struct sk_buff *skb, struct net_device *dev)
struct packet_type *pt)
{ {
u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN; u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
...@@ -134,8 +133,7 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb, ...@@ -134,8 +133,7 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb,
return skb; return skb;
} }
static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev, static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev)
struct packet_type *pt)
{ {
/* Tag decoding */ /* Tag decoding */
u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN; u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
......
net/dsa/tag_lan9303.c
View file @ 29a097b7
...@@ -74,8 +74,7 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -74,8 +74,7 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)
return skb; return skb;
} }
static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev, static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev)
struct packet_type *pt)
{ {
__be16 *lan9303_tag; __be16 *lan9303_tag;
u16 lan9303_tag1; u16 lan9303_tag1;
......
net/dsa/tag_mtk.c
View file @ 29a097b7
...@@ -61,8 +61,7 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb, ...@@ -61,8 +61,7 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,
return skb; return skb;
} }
static struct sk_buff *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)
{ {
u16 hdr; u16 hdr;
int port; int port;
......
net/dsa/tag_ocelot.c
View file @ 29a097b7
...@@ -55,8 +55,7 @@ static struct sk_buff *seville_xmit(struct sk_buff *skb, ...@@ -55,8 +55,7 @@ static struct sk_buff *seville_xmit(struct sk_buff *skb,
} }
static struct sk_buff *ocelot_rcv(struct sk_buff *skb, static struct sk_buff *ocelot_rcv(struct sk_buff *skb,
struct net_device *netdev, struct net_device *netdev)
struct packet_type *pt)
{ {
u64 src_port, qos_class; u64 src_port, qos_class;
u64 vlan_tci, tag_type; u64 vlan_tci, tag_type;
......
net/dsa/tag_ocelot_8021q.c
View file @ 29a097b7
...@@ -38,8 +38,7 @@ static struct sk_buff *ocelot_xmit(struct sk_buff *skb, ...@@ -38,8 +38,7 @@ static struct sk_buff *ocelot_xmit(struct sk_buff *skb,
} }
static struct sk_buff *ocelot_rcv(struct sk_buff *skb, static struct sk_buff *ocelot_rcv(struct sk_buff *skb,
struct net_device *netdev, struct net_device *netdev)
struct packet_type *pt)
{ {
int src_port, switch_id; int src_port, switch_id;
......
net/dsa/tag_qca.c
View file @ 29a097b7
...@@ -48,8 +48,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -48,8 +48,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)
return skb; return skb;
} }
static struct sk_buff *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)
{ {
u8 ver; u8 ver;
u16 hdr; u16 hdr;
......
net/dsa/tag_rtl4_a.c
View file @ 29a097b7
...@@ -64,8 +64,7 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb, ...@@ -64,8 +64,7 @@ static struct sk_buff *rtl4a_tag_xmit(struct sk_buff *skb,
} }
static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb, static struct sk_buff *rtl4a_tag_rcv(struct sk_buff *skb,
struct net_device *dev, struct net_device *dev)
struct packet_type *pt)
{ {
u16 protport; u16 protport;
__be16 *p; __be16 *p;
......
net/dsa/tag_sja1105.c
View file @ 29a097b7
...@@ -391,8 +391,7 @@ static void sja1105_vlan_rcv(struct sk_buff *skb, int *source_port, ...@@ -391,8 +391,7 @@ static void sja1105_vlan_rcv(struct sk_buff *skb, int *source_port,
} }
static struct sk_buff *sja1105_rcv(struct sk_buff *skb, static struct sk_buff *sja1105_rcv(struct sk_buff *skb,
struct net_device *netdev, struct net_device *netdev)
struct packet_type *pt)
{ {
int source_port = -1, switch_id = -1; int source_port = -1, switch_id = -1;
struct sja1105_meta meta = {0}; struct sja1105_meta meta = {0};
...@@ -546,8 +545,7 @@ static struct sk_buff *sja1110_rcv_inband_control_extension(struct sk_buff *skb, ...@@ -546,8 +545,7 @@ static struct sk_buff *sja1110_rcv_inband_control_extension(struct sk_buff *skb,
} }
static struct sk_buff *sja1110_rcv(struct sk_buff *skb, static struct sk_buff *sja1110_rcv(struct sk_buff *skb,
struct net_device *netdev, struct net_device *netdev)
struct packet_type *pt)
{ {
int source_port = -1, switch_id = -1; int source_port = -1, switch_id = -1;
bool host_only = false; bool host_only = false;
......
net/dsa/tag_trailer.c
View file @ 29a097b7
...@@ -24,8 +24,7 @@ static struct sk_buff *trailer_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -24,8 +24,7 @@ static struct sk_buff *trailer_xmit(struct sk_buff *skb, struct net_device *dev)
return skb; return skb;
} }
static struct sk_buff *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)
{ {
u8 *trailer; u8 *trailer;
int source_port; int source_port;
......
net/dsa/tag_xrs700x.c
View file @ 29a097b7
...@@ -25,8 +25,7 @@ static struct sk_buff *xrs700x_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -25,8 +25,7 @@ static struct sk_buff *xrs700x_xmit(struct sk_buff *skb, struct net_device *dev)
return skb; return skb;
} }
static struct sk_buff *xrs700x_rcv(struct sk_buff *skb, struct net_device *dev, static struct sk_buff *xrs700x_rcv(struct sk_buff *skb, struct net_device *dev)
struct packet_type *pt)
{ {
int source_port; int source_port;
u8 *trailer; u8 *trailer;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7