Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
This commit is contained in:
@@ -1426,15 +1426,6 @@ static inline bool netdev_uses_dsa_tags(struct net_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifndef CONFIG_NET_NS
|
||||
static inline void skb_set_dev(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
skb->dev = dev;
|
||||
}
|
||||
#else /* CONFIG_NET_NS */
|
||||
void skb_set_dev(struct sk_buff *skb, struct net_device *dev);
|
||||
#endif
|
||||
|
||||
static inline bool netdev_uses_trailer_tags(struct net_device *dev)
|
||||
{
|
||||
#ifdef CONFIG_NET_DSA_TAG_TRAILER
|
||||
|
Reference in New Issue
Block a user