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

Commit 89e49506 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

dsa: remove unused net_device arg from handlers 



compile tested only, but saw no warnings/errors with
allmodconfig build.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d1ef551a

include/net/dsa.h

+2 −4
Original line number Diff line number Diff line
@@ -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.

net/dsa/dsa.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/dsa/tag_brcm.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

net/dsa/tag_dsa.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

net/dsa/tag_edsa.c

+1 −2
Original line number Diff line number Diff line
@@ -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;