dsa: remove unused net_device arg from handlers

Florian Westphal · davem330 · commit 89e49506bc62 · 2017-08-21T10:39:11.000-07:00
compile tested only, but saw no warnings/errors with
allmodconfig build.

Signed-off-by: Florian Westphal &lt;fw@strlen.de&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/dsa.h b/include/net/dsa.h
@@ -104,8 +104,7 @@ struct packet_type;
 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 net_device *orig_dev);
+			       struct packet_type *pt);
 	int (*flow_dissect)(const struct sk_buff *skb, __be16 *proto,
 			    int *offset);
 };
@@ -134,8 +133,7 @@ struct dsa_switch_tree {
 	/* Copy of tag_ops->rcv for faster access in hot path */
 	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);
 
 	/*
 	 * The switch port to which the CPU is attached.
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
@@ -186,7 +186,7 @@ struct net_device *dsa_dev_to_net_device(struct device *dev)
 EXPORT_SYMBOL_GPL(dsa_dev_to_net_device);
 
 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 *unused)
 {
 	struct dsa_switch_tree *dst = dev->dsa_ptr;
 	struct sk_buff *nskb = NULL;
@@ -202,7 +202,7 @@ static int dsa_switch_rcv(struct sk_buff *skb, struct net_device *dev,
 	if (!skb)
 		return 0;
 
-	nskb = dst->rcv(skb, dev, pt, orig_dev);
+	nskb = dst->rcv(skb, dev, pt);
 	if (!nskb) {
 		kfree_skb(skb);
 		return 0;
diff --git a/net/dsa/tag_brcm.c b/net/dsa/tag_brcm.c
@@ -89,8 +89,7 @@ static struct sk_buff *brcm_tag_xmit(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 dsa_switch_tree *dst = dev->dsa_ptr;
 	struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
diff --git a/net/dsa/tag_dsa.c b/net/dsa/tag_dsa.c
@@ -65,8 +65,7 @@ static struct sk_buff *dsa_xmit(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 dsa_switch_tree *dst = dev->dsa_ptr;
 	struct dsa_switch *ds;
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
@@ -78,8 +78,7 @@ static struct sk_buff *edsa_xmit(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 dsa_switch_tree *dst = dev->dsa_ptr;
 	struct dsa_switch *ds;
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
@@ -76,8 +76,7 @@ static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev)
 }
 
 static struct sk_buff *ksz_rcv(struct sk_buff *skb, struct net_device *dev,
-			       struct packet_type *pt,
-			       struct net_device *orig_dev)
+			       struct packet_type *pt)
 {
 	struct dsa_switch_tree *dst = dev->dsa_ptr;
 	struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
diff --git a/net/dsa/tag_lan9303.c b/net/dsa/tag_lan9303.c
@@ -68,7 +68,7 @@ static struct sk_buff *lan9303_xmit(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, struct net_device *orig_dev)
+			struct packet_type *pt)
 {
 	u16 *lan9303_tag;
 	struct dsa_switch_tree *dst = dev->dsa_ptr;
diff --git a/net/dsa/tag_mtk.c b/net/dsa/tag_mtk.c
@@ -44,8 +44,7 @@ static struct sk_buff *mtk_tag_xmit(struct sk_buff *skb,
 }
 
 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 dsa_switch_tree *dst = dev->dsa_ptr;
 	struct dsa_switch *ds;
diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c
@@ -63,8 +63,7 @@ static struct sk_buff *qca_tag_xmit(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 dsa_switch_tree *dst = dev->dsa_ptr;
 	struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);
diff --git a/net/dsa/tag_trailer.c b/net/dsa/tag_trailer.c
@@ -56,8 +56,7 @@ static struct sk_buff *trailer_xmit(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 dsa_switch_tree *dst = dev->dsa_ptr;
 	struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);

Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,7 @@ static struct sk_buff brcm_tag_xmit(struct sk_buff skb, struct net_device *dev`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`static struct sk_buff brcm_tag_rcv(struct sk_buff skb, struct net_device *dev,`
`92`		`- struct packet_type *pt,`
`93`		`- struct net_device *orig_dev)`
	`92`	`+ struct packet_type *pt)`
`94`	`93`	`{`
`95`	`94`	`struct dsa_switch_tree *dst = dev->dsa_ptr;`
`96`	`95`	`struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,7 @@ static struct sk_buff dsa_xmit(struct sk_buff skb, struct net_device *dev)`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`static struct sk_buff dsa_rcv(struct sk_buff skb, struct net_device *dev,`
`68`		`- struct packet_type *pt,`
`69`		`- struct net_device *orig_dev)`
	`68`	`+ struct packet_type *pt)`
`70`	`69`	`{`
`71`	`70`	`struct dsa_switch_tree *dst = dev->dsa_ptr;`
`72`	`71`	`struct dsa_switch *ds;`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,7 @@ static struct sk_buff edsa_xmit(struct sk_buff skb, struct net_device *dev)`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`static struct sk_buff edsa_rcv(struct sk_buff skb, struct net_device *dev,`
`81`		`- struct packet_type *pt,`
`82`		`- struct net_device *orig_dev)`
	`81`	`+ struct packet_type *pt)`
`83`	`82`	`{`
`84`	`83`	`struct dsa_switch_tree *dst = dev->dsa_ptr;`
`85`	`84`	`struct dsa_switch *ds;`
Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,7 @@ static struct sk_buff ksz_xmit(struct sk_buff skb, struct net_device *dev)`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`static struct sk_buff ksz_rcv(struct sk_buff skb, struct net_device *dev,`
`79`		`- struct packet_type *pt,`
`80`		`- struct net_device *orig_dev)`
	`79`	`+ struct packet_type *pt)`
`81`	`80`	`{`
`82`	`81`	`struct dsa_switch_tree *dst = dev->dsa_ptr;`
`83`	`82`	`struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ static struct sk_buff lan9303_xmit(struct sk_buff skb, struct net_device *dev)`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`static struct sk_buff lan9303_rcv(struct sk_buff skb, struct net_device *dev,`
`71`		`- struct packet_type pt, struct net_device orig_dev)`
	`71`	`+ struct packet_type *pt)`
`72`	`72`	`{`
`73`	`73`	`u16 *lan9303_tag;`
`74`	`74`	`struct dsa_switch_tree *dst = dev->dsa_ptr;`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,7 @@ static struct sk_buff mtk_tag_xmit(struct sk_buff skb,`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`static struct sk_buff mtk_tag_rcv(struct sk_buff skb, struct net_device *dev,`
`47`		`- struct packet_type *pt,`
`48`		`- struct net_device *orig_dev)`
	`47`	`+ struct packet_type *pt)`
`49`	`48`	`{`
`50`	`49`	`struct dsa_switch_tree *dst = dev->dsa_ptr;`
`51`	`50`	`struct dsa_switch *ds;`
Original file line number	Diff line number	Diff line change
`@@ -63,8 +63,7 @@ static struct sk_buff qca_tag_xmit(struct sk_buff skb, struct net_device *dev)`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`static struct sk_buff qca_tag_rcv(struct sk_buff skb, struct net_device *dev,`
`66`		`- struct packet_type *pt,`
`67`		`- struct net_device *orig_dev)`
	`66`	`+ struct packet_type *pt)`
`68`	`67`	`{`
`69`	`68`	`struct dsa_switch_tree *dst = dev->dsa_ptr;`
`70`	`69`	`struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);`
Original file line number	Diff line number	Diff line change
`@@ -56,8 +56,7 @@ static struct sk_buff trailer_xmit(struct sk_buff skb, struct net_device *dev)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`static struct sk_buff trailer_rcv(struct sk_buff skb, struct net_device *dev,`
`59`		`- struct packet_type *pt,`
`60`		`- struct net_device *orig_dev)`
	`59`	`+ struct packet_type *pt)`
`61`	`60`	`{`
`62`	`61`	`struct dsa_switch_tree *dst = dev->dsa_ptr;`
`63`	`62`	`struct dsa_port *cpu_dp = dsa_get_cpu_port(dst);`