net: core: fix compile error inside flow_dissector due to new dsa callback
The following error was introduced by
commit 43e665287f
("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>
This commit is contained in:
parent
7e1ecbcf79
commit
2d57164564
|
@ -441,6 +441,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
|
||||||
skb->vlan_proto : skb->protocol;
|
skb->vlan_proto : skb->protocol;
|
||||||
nhoff = skb_network_offset(skb);
|
nhoff = skb_network_offset(skb);
|
||||||
hlen = skb_headlen(skb);
|
hlen = skb_headlen(skb);
|
||||||
|
#if IS_ENABLED(CONFIG_NET_DSA)
|
||||||
if (unlikely(netdev_uses_dsa(skb->dev))) {
|
if (unlikely(netdev_uses_dsa(skb->dev))) {
|
||||||
const struct dsa_device_ops *ops;
|
const struct dsa_device_ops *ops;
|
||||||
int offset;
|
int offset;
|
||||||
|
@ -452,6 +453,7 @@ bool __skb_flow_dissect(const struct sk_buff *skb,
|
||||||
nhoff += offset;
|
nhoff += offset;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* It is ensured by skb_flow_dissector_init() that control key will
|
/* It is ensured by skb_flow_dissector_init() that control key will
|
||||||
|
|
Loading…
Reference in a new issue