diff options
| author |   John Crispin <john@phrozen.org> | 2017-08-10 10:09:03 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-08-10 09:16:05 -0700 |
| commit | 2d5716456404a1ba097d46770f82f23a2457a873 (patch) | |
| tree | abb69a031500832028d9afe201b94b392227fa8a /net/core/flow_dissector.c | |
| parent | Merge branch 'dsa-flow-dissection' (diff) | |
| download | linux-dev-2d5716456404a1ba097d46770f82f23a2457a873.tar.xz linux-dev-2d5716456404a1ba097d46770f82f23a2457a873.zip | |
net: core: fix compile error inside flow_dissector due to new dsa callback
The following error was introduced by
commit 43e665287f93 ("net-next: dsa: fix flow dissection")
due to a missing #if guard
net/core/flow_dissector.c: In function '__skb_flow_dissect':
net/core/flow_dissector.c:448:18: error: 'struct net_device' has no member named 'dsa_ptr'
ops = skb->dev->dsa_ptr->tag_ops;
^
make[3]: *** [net/core/flow_dissector.o] Error 1
Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/core/flow_dissector.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 5b5be9577257..79b9c06c83ad 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -441,6 +441,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb, skb->vlan_proto : skb->protocol; nhoff = skb_network_offset(skb); hlen = skb_headlen(skb); +#if IS_ENABLED(CONFIG_NET_DSA) if (unlikely(netdev_uses_dsa(skb->dev))) { const struct dsa_device_ops *ops; int offset; @@ -452,6 +453,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb, nhoff += offset; } } +#endif } /* It is ensured by skb_flow_dissector_init() that control key will |