[Madwifi-cvs] revision 4178 committed

[Pavel R. <svn...@ma...>]

Project     : madwifi
Revision    : 4178
Author      : proski (Pavel Roskin)
Date        : 2012-01-30 20:56:17 +0100 (Mon, 30 Jan 2012)

Log Message :
Don't reference vlan_group without IEEE80211_VLAN_TAG_USED set

struct vlan_group will be removed in Linux 3.3.

Affected Files:
* madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h  updated             
* madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h  updated             
* madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.h  updated             


Modified: madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h
===================================================================
--- madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h	2012-01-30 19:55:03 UTC (rev 4177)
+++ madwifi/branches/madwifi-0.9.4/net80211/ieee80211_linux.h	2012-01-30 19:56:17 UTC (rev 4178)
@@ -566,8 +566,10 @@
 	struct net_device *);
 int 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_ */

Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h	2012-01-30 19:55:03 UTC (rev 4177)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_linux.h	2012-01-30 19:56:17 UTC (rev 4178)
@@ -643,8 +643,11 @@
 	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_ */

Modified: madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.h
===================================================================
--- madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.h	2012-01-30 19:55:03 UTC (rev 4177)
+++ madwifi/branches/madwifi-dfs/net80211/ieee80211_skb.h	2012-01-30 19:56:17 UTC (rev 4178)
@@ -113,8 +113,10 @@
 
 #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);