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

vladimiroltean · davem330 · commit 29a097b77477 · 2021-08-02T15:13:15.000+01:00
No tagging driver uses this.

Signed-off-by: Vladimir Oltean &lt;vladimir.oltean@nxp.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/dsa.h b/include/net/dsa.h
@@ -79,13 +79,11 @@ enum dsa_tag_protocol {
 	DSA_TAG_PROTO_SJA1110		= DSA_TAG_PROTO_SJA1110_VALUE,
 };
 
-struct packet_type;
 struct dsa_switch;
 
 struct dsa_device_ops {
 	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 packet_type *pt);
+	struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev);
 	void (*flow_dissect)(const struct sk_buff *skb, __be16 *proto,
 			     int *offset);
 	unsigned int needed_headroom;
@@ -239,8 +237,7 @@ struct dsa_port {
 
 	/* Copies for faster access in master receive hot path */
 	struct dsa_switch_tree *dst;
-	struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev,
-			       struct packet_type *pt);
+	struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev);
 
 	enum {
 		DSA_PORT_TYPE_UNUSED = 0,
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
@@ -238,7 +238,7 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
 	if (!skb)
 		return 0;
 
-	nskb = cpu_dp->rcv(skb, dev, pt);
+	nskb = cpu_dp->rcv(skb, dev);
 	if (!nskb) {
 		kfree_skb(skb);
 		return 0;
diff --git a/net/dsa/tag_ar9331.c b/net/dsa/tag_ar9331.c
@@ -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,
-				      struct net_device *ndev,
-				      struct packet_type *pt)
+				      struct net_device *ndev)
 {
 	u8 ver, port;
 	u16 hdr;
diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
@@ -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,
 				       struct net_device *dev,
-				       struct packet_type *pt,
 				       unsigned int offset)
 {
 	int source_port;
@@ -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,
-				    struct packet_type *pt)
+static struct sk_buff *brcm_tag_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	struct sk_buff *nskb;
 
 	/* 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)
 		return nskb;
 
@@ -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,
-					struct net_device *dev,
-					struct packet_type *pt)
+					struct net_device *dev)
 {
 	int source_port;
 	u8 *brcm_tag;
@@ -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,
-					    struct net_device *dev,
-					    struct packet_type *pt)
+					    struct net_device *dev)
 {
 	/* 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 = {
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
@@ -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);
 }
 
-static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev,
-			       struct packet_type *pt)
+static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	if (unlikely(!pskb_may_pull(skb, DSA_HLEN)))
 		return NULL;
@@ -373,8 +372,7 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev)
 	return skb;
 }
 
-static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev,
-				struct packet_type *pt)
+static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	if (unlikely(!pskb_may_pull(skb, EDSA_HLEN)))
 		return NULL;
diff --git a/net/dsa/tag_gswip.c b/net/dsa/tag_gswip.c
@@ -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,
-				     struct net_device *dev,
-				     struct packet_type *pt)
+				     struct net_device *dev)
 {
 	int port;
 	u8 *gswip_tag;
diff --git a/net/dsa/tag_hellcreek.c b/net/dsa/tag_hellcreek.c
@@ -29,8 +29,7 @@ static struct sk_buff *hellcreek_xmit(struct sk_buff *skb,
 }
 
 static struct sk_buff *hellcreek_rcv(struct sk_buff *skb,
-				     struct net_device *dev,
-				     struct packet_type *pt)
+				     struct net_device *dev)
 {
 	/* Tag decoding */
 	u8 *tag = skb_tail_pointer(skb) - HELLCREEK_TAG_LEN;
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
@@ -67,8 +67,7 @@ static struct sk_buff *ksz8795_xmit(struct sk_buff *skb, struct net_device *dev)
 	return skb;
 }
 
-static struct sk_buff *ksz8795_rcv(struct sk_buff *skb, struct net_device *dev,
-				  struct packet_type *pt)
+static struct sk_buff *ksz8795_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
 
@@ -134,8 +133,7 @@ static struct sk_buff *ksz9477_xmit(struct sk_buff *skb,
 	return skb;
 }
 
-static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev,
-				   struct packet_type *pt)
+static struct sk_buff *ksz9477_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	/* Tag decoding */
 	u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;
diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c
@@ -74,8 +74,7 @@ static struct sk_buff *lan9303_xmit(struct sk_buff *skb, struct net_device *dev)
 	return skb;
 }
 
-static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev,
-				   struct packet_type *pt)
+static struct sk_buff *lan9303_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	__be16 *lan9303_tag;
 	u16 lan9303_tag1;
diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c
@@ -61,8 +61,7 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,
 	return skb;
 }
 
-static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev,
-				   struct packet_type *pt)
+static struct sk_buff *mtk_tag_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	u16 hdr;
 	int port;
diff --git a/net/dsa/tag_ocelot.c b/net/dsa/tag_ocelot.c
@@ -55,8 +55,7 @@ static struct sk_buff *seville_xmit(struct sk_buff *skb,
 }
 
 static struct sk_buff *ocelot_rcv(struct sk_buff *skb,
-				  struct net_device *netdev,
-				  struct packet_type *pt)
+				  struct net_device *netdev)
 {
 	u64 src_port, qos_class;
 	u64 vlan_tci, tag_type;
diff --git a/net/dsa/tag_ocelot_8021q.c b/net/dsa/tag_ocelot_8021q.c
@@ -38,8 +38,7 @@ static struct sk_buff *ocelot_xmit(struct sk_buff *skb,
 }
 
 static struct sk_buff *ocelot_rcv(struct sk_buff *skb,
-				  struct net_device *netdev,
-				  struct packet_type *pt)
+				  struct net_device *netdev)
 {
 	int src_port, switch_id;
 
diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
@@ -48,8 +48,7 @@ static struct sk_buff *qca_tag_xmit(struct sk_buff *skb, struct net_device *dev)
 	return skb;
 }
 
-static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev,
-				   struct packet_type *pt)
+static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	u8 ver;
 	u16  hdr;
diff --git a/net/dsa/tag_rtl4_a.c b/net/dsa/tag_rtl4_a.c
@@ -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,
-				     struct net_device *dev,
-				     struct packet_type *pt)
+				     struct net_device *dev)
 {
 	u16 protport;
 	__be16 *p;
diff --git a/net/dsa/tag_sja1105.c b/net/dsa/tag_sja1105.c
@@ -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,
-				   struct net_device *netdev,
-				   struct packet_type *pt)
+				   struct net_device *netdev)
 {
 	int source_port = -1, switch_id = -1;
 	struct sja1105_meta meta = {0};
@@ -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,
-				   struct net_device *netdev,
-				   struct packet_type *pt)
+				   struct net_device *netdev)
 {
 	int source_port = -1, switch_id = -1;
 	bool host_only = false;
diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c
@@ -24,8 +24,7 @@ static struct sk_buff *trailer_xmit(struct sk_buff *skb, struct net_device *dev)
 	return skb;
 }
 
-static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev,
-				   struct packet_type *pt)
+static struct sk_buff *trailer_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	u8 *trailer;
 	int source_port;
diff --git a/net/dsa/tag_xrs700x.c b/net/dsa/tag_xrs700x.c
@@ -25,8 +25,7 @@ static struct sk_buff *xrs700x_xmit(struct sk_buff *skb, struct net_device *dev)
 	return skb;
 }
 
-static struct sk_buff *xrs700x_rcv(struct sk_buff *skb, struct net_device *dev,
-				   struct packet_type *pt)
+static struct sk_buff *xrs700x_rcv(struct sk_buff *skb, struct net_device *dev)
 {
 	int source_port;
 	u8 *trailer;

Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ static struct sk_buff ar9331_tag_xmit(struct sk_buff skb,`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`static struct sk_buff ar9331_tag_rcv(struct sk_buff skb,`
`47`		`- struct net_device *ndev,`
`48`		`- struct packet_type *pt)`
	`47`	`+ struct net_device *ndev)`
`49`	`48`	`{`
`50`	`49`	`u8 ver, port;`
`51`	`50`	`u16 hdr;`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,6 @@ static struct sk_buff brcm_tag_xmit_ll(struct sk_buff skb,`
`136`	`136`	`*/`
`137`	`137`	`static struct sk_buff brcm_tag_rcv_ll(struct sk_buff skb,`
`138`	`138`	`struct net_device *dev,`
`139`		`- struct packet_type *pt,`
`140`	`139`	`unsigned int offset)`
`141`	`140`	`{`
`142`	`141`	`int source_port;`
`@@ -182,13 +181,12 @@ static struct sk_buff brcm_tag_xmit(struct sk_buff skb,`
`182`	`181`	`}`
`183`	`182`
`184`	`183`
`185`		`-static struct sk_buff brcm_tag_rcv(struct sk_buff skb, struct net_device *dev,`
`186`		`- struct packet_type *pt)`
	`184`	`+static struct sk_buff brcm_tag_rcv(struct sk_buff skb, struct net_device *dev)`
`187`	`185`	`{`
`188`	`186`	`struct sk_buff *nskb;`
`189`	`187`
`190`	`188`	`/* skb->data points to the EtherType, the tag is right before it */`
`191`		`- nskb = brcm_tag_rcv_ll(skb, dev, pt, 2);`
	`189`	`+ nskb = brcm_tag_rcv_ll(skb, dev, 2);`
`192`	`190`	`if (!nskb)`
`193`	`191`	`return nskb;`
`194`	`192`
`@@ -251,8 +249,7 @@ static struct sk_buff brcm_leg_tag_xmit(struct sk_buff skb,`
`251`	`249`	`}`
`252`	`250`
`253`	`251`	`static struct sk_buff brcm_leg_tag_rcv(struct sk_buff skb,`
`254`		`- struct net_device *dev,`
`255`		`- struct packet_type *pt)`
	`252`	`+ struct net_device *dev)`
`256`	`253`	`{`
`257`	`254`	`int source_port;`
`258`	`255`	`u8 *brcm_tag;`
`@@ -302,11 +299,10 @@ static struct sk_buff brcm_tag_xmit_prepend(struct sk_buff skb,`
`302`	`299`	`}`
`303`	`300`
`304`	`301`	`static struct sk_buff brcm_tag_rcv_prepend(struct sk_buff skb,`
`305`		`- struct net_device *dev,`
`306`		`- struct packet_type *pt)`
	`302`	`+ struct net_device *dev)`
`307`	`303`	`{`
`308`	`304`	`/* tag is prepended to the packet */`
`309`		`- return brcm_tag_rcv_ll(skb, dev, pt, ETH_HLEN);`
	`305`	`+ return brcm_tag_rcv_ll(skb, dev, ETH_HLEN);`
`310`	`306`	`}`
`311`	`307`
`312`	`308`	`static const struct dsa_device_ops brcm_prepend_netdev_ops = {`
Original file line number	Diff line number	Diff line change
`@@ -332,8 +332,7 @@ static struct sk_buff dsa_xmit(struct sk_buff skb, struct net_device *dev)`
`332`	`332`	`return dsa_xmit_ll(skb, dev, 0);`
`333`	`333`	`}`
`334`	`334`
`335`		`-static struct sk_buff dsa_rcv(struct sk_buff skb, struct net_device *dev,`
`336`		`- struct packet_type *pt)`
	`335`	`+static struct sk_buff dsa_rcv(struct sk_buff skb, struct net_device *dev)`
`337`	`336`	`{`
`338`	`337`	`if (unlikely(!pskb_may_pull(skb, DSA_HLEN)))`
`339`	`338`	`return NULL;`
`@@ -373,8 +372,7 @@ static struct sk_buff edsa_xmit(struct sk_buff skb, struct net_device *dev)`
`373`	`372`	`return skb;`
`374`	`373`	`}`
`375`	`374`
`376`		`-static struct sk_buff edsa_rcv(struct sk_buff skb, struct net_device *dev,`
`377`		`- struct packet_type *pt)`
	`375`	`+static struct sk_buff edsa_rcv(struct sk_buff skb, struct net_device *dev)`
`378`	`376`	`{`
`379`	`377`	`if (unlikely(!pskb_may_pull(skb, EDSA_HLEN)))`
`380`	`378`	`return NULL;`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,7 @@ static struct sk_buff gswip_tag_xmit(struct sk_buff skb,`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`static struct sk_buff gswip_tag_rcv(struct sk_buff skb,`
`78`		`- struct net_device *dev,`
`79`		`- struct packet_type *pt)`
	`78`	`+ struct net_device *dev)`
`80`	`79`	`{`
`81`	`80`	`int port;`
`82`	`81`	`u8 *gswip_tag;`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ static struct sk_buff hellcreek_xmit(struct sk_buff skb,`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`static struct sk_buff hellcreek_rcv(struct sk_buff skb,`
`32`		`- struct net_device *dev,`
`33`		`- struct packet_type *pt)`
	`32`	`+ struct net_device *dev)`
`34`	`33`	`{`
`35`	`34`	`/* Tag decoding */`
`36`	`35`	`u8 *tag = skb_tail_pointer(skb) - HELLCREEK_TAG_LEN;`
Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,7 @@ static struct sk_buff ksz8795_xmit(struct sk_buff skb, struct net_device *dev)`
`67`	`67`	`return skb;`
`68`	`68`	`}`
`69`	`69`
`70`		`-static struct sk_buff ksz8795_rcv(struct sk_buff skb, struct net_device *dev,`
`71`		`- struct packet_type *pt)`
	`70`	`+static struct sk_buff ksz8795_rcv(struct sk_buff skb, struct net_device *dev)`
`72`	`71`	`{`
`73`	`72`	`u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;`
`74`	`73`
`@@ -134,8 +133,7 @@ static struct sk_buff ksz9477_xmit(struct sk_buff skb,`
`134`	`133`	`return skb;`
`135`	`134`	`}`
`136`	`135`
`137`		`-static struct sk_buff ksz9477_rcv(struct sk_buff skb, struct net_device *dev,`
`138`		`- struct packet_type *pt)`
	`136`	`+static struct sk_buff ksz9477_rcv(struct sk_buff skb, struct net_device *dev)`
`139`	`137`	`{`
`140`	`138`	`/* Tag decoding */`
`141`	`139`	`u8 *tag = skb_tail_pointer(skb) - KSZ_EGRESS_TAG_LEN;`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,7 @@ static struct sk_buff lan9303_xmit(struct sk_buff skb, struct net_device *dev)`
`74`	`74`	`return skb;`
`75`	`75`	`}`
`76`	`76`
`77`		`-static struct sk_buff lan9303_rcv(struct sk_buff skb, struct net_device *dev,`
`78`		`- struct packet_type *pt)`
	`77`	`+static struct sk_buff lan9303_rcv(struct sk_buff skb, struct net_device *dev)`
`79`	`78`	`{`
`80`	`79`	`__be16 *lan9303_tag;`
`81`	`80`	`u16 lan9303_tag1;`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ static struct sk_buff mtk_tag_xmit(struct sk_buff skb,`
`61`	`61`	`return skb;`
`62`	`62`	`}`
`63`	`63`
`64`		`-static struct sk_buff mtk_tag_rcv(struct sk_buff skb, struct net_device *dev,`
`65`		`- struct packet_type *pt)`
	`64`	`+static struct sk_buff mtk_tag_rcv(struct sk_buff skb, struct net_device *dev)`
`66`	`65`	`{`
`67`	`66`	`u16 hdr;`
`68`	`67`	`int port;`