diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-08 13:49:36 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-08 13:49:36 -0700 |
| commit | 417d978fa532b61b89f0c3ccbd9cdb51090ea032 (patch) | |
| tree | 93e0c28cdfcac7bb616f9b767c4a782a2e620bce /net/dsa/dsa_priv.h | |
| parent | 7f564528a480084e2318cd48caba7aef4a54a77f (diff) | |
| parent | a86d8becc3f04a5e350b5a17530e6a01495c00a5 (diff) | |
Merge branch 'dsa-receive-path-simplifications'
Florian Fainelli says:
====================
net: dsa: Receive path simplifications
This patch series does factor the common code found in all tag implementations
into dsa_switch_rcv(). The original motivation was to add GRO support, but this
may be a lot of work with unclear benefits at this point.
Changes in v2:
- take care of tag_mtk.c in the process
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dsa/dsa_priv.h')
| -rw-r--r-- | net/dsa/dsa_priv.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h index 2a3139921811..107138a55bd8 100644 --- a/net/dsa/dsa_priv.h +++ b/net/dsa/dsa_priv.h @@ -17,8 +17,9 @@ struct dsa_device_ops { struct sk_buff *(*xmit)(struct sk_buff *skb, struct net_device *dev); - int (*rcv)(struct sk_buff *skb, struct net_device *dev, - struct packet_type *pt, struct net_device *orig_dev); + struct sk_buff *(*rcv)(struct sk_buff *skb, struct net_device *dev, + struct packet_type *pt, + struct net_device *orig_dev); }; struct dsa_slave_priv { |