diff options
| author | David S. Miller <davem@davemloft.net> | 2017-04-08 23:49:36 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-04-08 23:49:36 +0300 |
| commit | 417d978fa532b61b89f0c3ccbd9cdb51090ea032 (patch) | |
| tree | 93e0c28cdfcac7bb616f9b767c4a782a2e620bce /include | |
| parent | 7f564528a480084e2318cd48caba7aef4a54a77f (diff) | |
| parent | a86d8becc3f04a5e350b5a17530e6a01495c00a5 (diff) | |
| download | linux-417d978fa532b61b89f0c3ccbd9cdb51090ea032.tar.xz | |
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 'include')
| -rw-r--r-- | include/net/dsa.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/dsa.h b/include/net/dsa.h index 7ba9b1fb565c..9b1c1eb4147a 100644 --- a/include/net/dsa.h +++ b/include/net/dsa.h @@ -124,7 +124,7 @@ struct dsa_switch_tree { * protocol to use. */ struct net_device *master_netdev; - int (*rcv)(struct sk_buff *skb, + struct sk_buff * (*rcv)(struct sk_buff *skb, struct net_device *dev, struct packet_type *pt, struct net_device *orig_dev); |