evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vlan: Fix build error wth vlan_get_encap_level()

Browse source 
The new function vlan_get_encap_level() uses vlan_dev_priv()
which is only conditionally avaialble when VLAN support is
enabled.  Make vlan_get_encap_level() conditionally available
as well.

Fixes: 44a4085538 ("bonding: Fix stacked device detection in arp monitoring")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Vlad Yasevich <vyasevic@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vlad Yasevich 2014-05-20 10:59:26 -04:00 • committed by David S. Miller
parent 4f337ed5c0
commit e1618d461c
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/linux/if_vlan.h
View file

@ -198,6 +198,12 @@ extern void vlan_vids_del_by_dev(struct net_device *dev,
const struct net_device *by_dev); const struct net_device *by_dev);
extern bool vlan_uses_dev(const struct net_device *dev); extern bool vlan_uses_dev(const struct net_device *dev);
static inline int vlan_get_encap_level(struct net_device *dev)
{
BUG_ON(!is_vlan_dev(dev));
return vlan_dev_priv(dev)->nest_level;
}
#else #else
static inline struct net_device * static inline struct net_device *
__vlan_find_dev_deep(struct net_device *real_dev, __vlan_find_dev_deep(struct net_device *real_dev,
@ -264,6 +270,11 @@ static inline bool vlan_uses_dev(const struct net_device *dev)
{ {
return false; return false;
} }
static inline int vlan_get_encap_level(struct net_device *dev)
{
BUG();
return 0;
}
#endif #endif
static inline bool vlan_hw_offload_capable(netdev_features_t features, static inline bool vlan_hw_offload_capable(netdev_features_t features,
@ -485,9 +496,4 @@ static inline void vlan_set_encap_proto(struct sk_buff *skb,
skb->protocol = htons(ETH_P_802_2); skb->protocol = htons(ETH_P_802_2);
} }
static inline int vlan_get_encap_level(struct net_device *dev)
{
BUG_ON(!is_vlan_dev(dev));
return vlan_dev_priv(dev)->nest_level;
}
#endif /* !(_LINUX_IF_VLAN_H_) */ #endif /* !(_LINUX_IF_VLAN_H_) */