Commit e1618d46 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

vlan: Fix build error wth vlan_get_encap_level() 



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: 44a40855 ("bonding: Fix stacked device detection in arp monitoring")
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
CC: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarVlad Yasevich <vyasevic@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f337ed5

include/linux/if_vlan.h

+11 −5
Original line number Original line Diff line number Diff line
@@ -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_) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE