Commit 2e8cb1b3 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: make the .flow_dissect tagger callback return void 



There is no tagger that returns anything other than zero, so just change
the return type appropriately.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5124197c

include/net/dsa.h

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

	int (*flow_dissect)(const struct sk_buff *skb, __be16 *proto,

	void (*flow_dissect)(const struct sk_buff *skb, __be16 *proto,

			     int *offset);

	/* Used to determine which traffic should match the DSA filter in

	 * eth_type_trans, and which, if any, should bypass it and be processed

net/core/flow_dissector.c

+2 −2
Original line number Diff line number Diff line
@@ -932,8 +932,8 @@ bool __skb_flow_dissect(const struct net *net, 
			int offset = 0;



			ops = skb->dev->dsa_ptr->tag_ops;

			if (ops->flow_dissect &&

			    !ops->flow_dissect(skb, &proto, &offset)) {

			if (ops->flow_dissect) {

				ops->flow_dissect(skb, &proto, &offset);

				hlen -= offset;

				nhoff += offset;

			}

net/dsa/tag_brcm.c

+2 −3
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static struct sk_buff *brcm_tag_rcv_ll(struct sk_buff *skb, 
	return skb;

}



static int brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,

static void brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,

				  int *offset)

{

	/* We have been called on the DSA master network device after
@@ -168,7 +168,6 @@ static int brcm_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto, 
	 */

	*offset = BRCM_TAG_LEN;

	*proto = ((__be16 *)skb->data)[1];

	return 0;

}

#endif

net/dsa/tag_dsa.c

+2 −3
Original line number Diff line number Diff line
@@ -142,12 +142,11 @@ static struct sk_buff *dsa_rcv(struct sk_buff *skb, struct net_device *dev, 
	return skb;

}



static int dsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,

static void dsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,

				 int *offset)

{

	*offset = 4;

	*proto = ((__be16 *)skb->data)[1];

	return 0;

}



static const struct dsa_device_ops dsa_netdev_ops = {

net/dsa/tag_edsa.c

+2 −3
Original line number Diff line number Diff line
@@ -192,12 +192,11 @@ static struct sk_buff *edsa_rcv(struct sk_buff *skb, struct net_device *dev, 
	return skb;

}



static int edsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,

static void edsa_tag_flow_dissect(const struct sk_buff *skb, __be16 *proto,

				  int *offset)

{

	*offset = 8;

	*proto = ((__be16 *)skb->data)[3];

	return 0;

}



static const struct dsa_device_ops edsa_netdev_ops = {