Don't reference vlan_group without IEEE80211_VLAN_TAG_USED set

struct vlan_group will be removed in Linux 3.3.

git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@4177 0192ed92-7a03-0410-a25b-9323aeb14dbd

diff --git a/net80211/ieee80211_linux.h b/net80211/ieee80211_linux.h
index b1f95fc298e82a36df6253477655167295f50999..179d4f2d342942d16aede0a7ee6d654c70efff40 100644 (file)
--- a/net80211/ieee80211_linux.h
+++ b/net80211/ieee80211_linux.h
@@ -643,8 +643,11 @@ int ieee80211_ioctl_create_vap(struct ieee80211com *, struct ifreq *,
        struct net_device *);
 struct ieee80211vap *ieee80211_create_vap(struct ieee80211com *, char *,
        struct net_device *, int, int);
+
+#if IEEE80211_VLAN_TAG_USED
 void ieee80211_vlan_register(struct net_device *dev, struct vlan_group *grp);
 void ieee80211_vlan_add_vid(struct net_device *dev, unsigned short vid);
 void ieee80211_vlan_kill_vid(struct net_device *dev, unsigned short vid);
+#endif
 
 #endif /* _NET80211_IEEE80211_LINUX_H_ */

diff --git a/net80211/ieee80211_skb.h b/net80211/ieee80211_skb.h
index eaafa900a3f5be44177fb27d2b8580d588c7c130..e80d8f883eb804f15838768531b59e2b49044c43 100644 (file)
--- a/net80211/ieee80211_skb.h
+++ b/net80211/ieee80211_skb.h
@@ -113,8 +113,10 @@ int ieee80211_skb_references(void);
 
 #ifdef IEEE80211_DEBUG_REFCNT
 
+#if IEEE80211_VLAN_TAG_USED
 int vlan_hwaccel_rx_debug(struct sk_buff *skb, struct vlan_group *grp,
                unsigned short vlan_tag, const char *func, int line);
+#endif
 int netif_rx_debug(struct sk_buff *skb, const char *func, int line);
 struct sk_buff *alloc_skb_debug(unsigned int length, gfp_t gfp_mask,
                const char *func, int line);