net: vlan: fix dummy function signatures for CONFIG_VLAN=n
Fix up some function signatures for CONFIG_VLAN=n that were missed during the 802.1ad support patches. Found by the kbuild robot. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
cf2c014ade
commit
9fae27b337
|
@ -104,7 +104,8 @@ extern void vlan_vids_del_by_dev(struct net_device *dev,
|
||||||
extern bool vlan_uses_dev(const struct net_device *dev);
|
extern bool vlan_uses_dev(const struct net_device *dev);
|
||||||
#else
|
#else
|
||||||
static inline struct net_device *
|
static inline struct net_device *
|
||||||
__vlan_find_dev_deep(struct net_device *real_dev, u16 vlan_id)
|
__vlan_find_dev_deep(struct net_device *real_dev,
|
||||||
|
__be16 vlan_proto, u16 vlan_id)
|
||||||
{
|
{
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -131,12 +132,12 @@ static inline struct sk_buff *vlan_untag(struct sk_buff *skb)
|
||||||
return skb;
|
return skb;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int vlan_vid_add(struct net_device *dev, unsigned short vid)
|
static inline int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void vlan_vid_del(struct net_device *dev, unsigned short vid)
|
static inline void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue