* [PATCH] net: vlan: fix dummy function signatures for CONFIG_VLAN=n
@ 2013-04-21 9:51 Patrick McHardy
2013-04-21 19:57 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Patrick McHardy @ 2013-04-21 9:51 UTC (permalink / raw)
To: davem; +Cc: netdev
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>
---
include/linux/if_vlan.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h
index a78f939..52bd03b 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,
extern bool vlan_uses_dev(const struct net_device *dev);
#else
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)
{
}
--
1.8.1.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net: vlan: fix dummy function signatures for CONFIG_VLAN=n
2013-04-21 9:51 [PATCH] net: vlan: fix dummy function signatures for CONFIG_VLAN=n Patrick McHardy
@ 2013-04-21 19:57 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2013-04-21 19:57 UTC (permalink / raw)
To: kaber; +Cc: davem, netdev
From: Patrick McHardy <kaber@trash.net>
Date: Sun, 21 Apr 2013 11:51:41 +0200
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-21 19:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-21 9:51 [PATCH] net: vlan: fix dummy function signatures for CONFIG_VLAN=n Patrick McHardy
2013-04-21 19:57 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox