From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Pirko Subject: Re: [patch net-next 2/3] vlan: add helper which can be called to se it device is used by vlan Date: Thu, 23 Aug 2012 15:42:07 +0200 Message-ID: <20120823134207.GC16103@minipsycho.orion> References: <1345728413-10298-1-git-send-email-jiri@resnulli.us> <1345728413-10298-3-git-send-email-jiri@resnulli.us> <50363112.4060407@mellanox.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, davem@davemloft.net, brouer@redhat.com, Patrick McHardy To: Or Gerlitz Return-path: Received: from mail-bk0-f46.google.com ([209.85.214.46]:58618 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758827Ab2HWNmT (ORCPT ); Thu, 23 Aug 2012 09:42:19 -0400 Received: by bkwj10 with SMTP id j10so243482bkw.19 for ; Thu, 23 Aug 2012 06:42:18 -0700 (PDT) Content-Disposition: inline In-Reply-To: <50363112.4060407@mellanox.com> Sender: netdev-owner@vger.kernel.org List-ID: Thu, Aug 23, 2012 at 03:33:06PM CEST, ogerlitz@mellanox.com wrote: >On 23/08/2012 16:26, Jiri Pirko wrote: >>also, remove unused vlan_info definition from header > >just a typo in the subject line, you probably wanted to say "see" and >not "se"? Yes. I need some coffe :( > >Or. > >> >>CC: Patrick McHardy >>Signed-off-by: Jiri Pirko >>--- >> include/linux/if_vlan.h | 9 +++++++-- >> net/8021q/vlan_core.c | 6 ++++++ >> 2 files changed, 13 insertions(+), 2 deletions(-) >> >>diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h >>index a810987..e6ff12d 100644 >>--- a/include/linux/if_vlan.h >>+++ b/include/linux/if_vlan.h >>@@ -74,8 +74,6 @@ static inline struct vlan_ethhdr *vlan_eth_hdr(const struct sk_buff *skb) >> /* found in socket.c */ >> extern void vlan_ioctl_set(int (*hook)(struct net *, void __user *)); >>-struct vlan_info; >>- >> static inline int is_vlan_dev(struct net_device *dev) >> { >> return dev->priv_flags & IFF_802_1Q_VLAN; >>@@ -101,6 +99,8 @@ extern int vlan_vids_add_by_dev(struct net_device *dev, >> const struct net_device *by_dev); >> extern void vlan_vids_del_by_dev(struct net_device *dev, >> const struct net_device *by_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) >>@@ -151,6 +151,11 @@ static inline void vlan_vids_del_by_dev(struct net_device *dev, >> const struct net_device *by_dev) >> { >> } >>+ >>+static inline bool vlan_uses_dev(const struct net_device *dev) >>+{ >>+ return false; >>+} >> #endif >> /** >>diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c >>index d4babc6..517b940 100644 >>--- a/net/8021q/vlan_core.c >>+++ b/net/8021q/vlan_core.c >>@@ -372,3 +372,9 @@ void vlan_vids_del_by_dev(struct net_device *dev, >> vlan_vid_del(dev, vid_info->vid); >> } >> EXPORT_SYMBOL(vlan_vids_del_by_dev); >>+ >>+bool vlan_uses_dev(const struct net_device *dev) >>+{ >>+ return rtnl_dereference(dev->vlan_info) ? true : false; >>+} >>+EXPORT_SYMBOL(vlan_uses_dev); >