Browse files

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 <>
Signed-off-by: David S. Miller <>
  • Loading branch information...
1 parent cf2c014 commit 9fae27b33785cb6350f21449073d9f7d1a2bbfd6 @kaber kaber committed with davem330 Apr 20, 2013
Showing with 4 additions and 3 deletions.
  1. +4 −3 include/linux/if_vlan.h
@@ -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);
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;
@@ -131,12 +132,12 @@ static inline struct sk_buff *vlan_untag(struct sk_buff *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;
-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)

0 comments on commit 9fae27b

Please sign in to comment.