diff options
author | Patrick McHardy <kaber@trash.net> | 2013-04-20 19:51:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-21 15:56:59 -0400 |
commit | 9fae27b33785cb6350f21449073d9f7d1a2bbfd6 (patch) | |
tree | 4371b8fa6863166f82ee56928b1c9826060fc1db /include/linux/if_vlan.h | |
parent | cf2c014adef10c75af7042f38e74adb91d7bff6c (diff) |
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>
Diffstat (limited to 'include/linux/if_vlan.h')
-rw-r--r-- | include/linux/if_vlan.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index a78f9390da87..52bd03b38962 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h | |||
@@ -104,7 +104,8 @@ extern void vlan_vids_del_by_dev(struct net_device *dev, | |||
104 | extern bool vlan_uses_dev(const struct net_device *dev); | 104 | extern bool vlan_uses_dev(const struct net_device *dev); |
105 | #else | 105 | #else |
106 | static inline struct net_device * | 106 | static inline struct net_device * |
107 | __vlan_find_dev_deep(struct net_device *real_dev, u16 vlan_id) | 107 | __vlan_find_dev_deep(struct net_device *real_dev, |
108 | __be16 vlan_proto, u16 vlan_id) | ||
108 | { | 109 | { |
109 | return NULL; | 110 | return NULL; |
110 | } | 111 | } |
@@ -131,12 +132,12 @@ static inline struct sk_buff *vlan_untag(struct sk_buff *skb) | |||
131 | return skb; | 132 | return skb; |
132 | } | 133 | } |
133 | 134 | ||
134 | static inline int vlan_vid_add(struct net_device *dev, unsigned short vid) | 135 | static inline int vlan_vid_add(struct net_device *dev, __be16 proto, u16 vid) |
135 | { | 136 | { |
136 | return 0; | 137 | return 0; |
137 | } | 138 | } |
138 | 139 | ||
139 | static inline void vlan_vid_del(struct net_device *dev, unsigned short vid) | 140 | static inline void vlan_vid_del(struct net_device *dev, __be16 proto, u16 vid) |
140 | { | 141 | { |
141 | } | 142 | } |
142 | 143 | ||