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

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

include/net/dsa.h

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

net/dsa/dsa.c

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

net/dsa/tag_ar9331.c

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

net/dsa/tag_brcm.c

+5 −9
Original line number Diff line number Diff line
@@ -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 = {

net/dsa/tag_dsa.c

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