PERFORCE change 112253 for review

[Kip Macy]

http://perforce.freebsd.org/chv.cgi?CH=112253

Change 112253 by kmacy at kmacy_storage:kmacy_wifi on 2006/12/28 22:19:33

	declare missing macro
	declare ifp

Affected files ...

.. //depot/projects/kmacy_wifi/sys/net80211/_ieee80211.h#3 edit
.. //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#4 edit

Differences ...

==== //depot/projects/kmacy_wifi/sys/net80211/_ieee80211.h#3 (text+ko) ====

@@ -146,6 +146,8 @@
 	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_OFDM)
 #define	IEEE80211_CHAN_G \
 	(IEEE80211_CHAN_2GHZ | IEEE80211_CHAN_DYN)
+#define IEEE80211_CHAN_T \
+        (IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
 #define IEEE80211_CHAN_108A \
 	(IEEE80211_CHAN_5GHZ | IEEE80211_CHAN_OFDM | IEEE80211_CHAN_TURBO)
 #define	IEEE80211_CHAN_108G \
@@ -171,6 +173,8 @@
 	(((_c)->ic_flags & IEEE80211_CHAN_G) == IEEE80211_CHAN_G)
 #define	IEEE80211_IS_CHAN_ANYG(_c) \
 	(IEEE80211_IS_CHAN_PUREG(_c) || IEEE80211_IS_CHAN_G(_c))
+#define IEEE80211_IS_CHAN_T(_c) \
+        (((_c)->ic_flags & IEEE80211_CHAN_T) == IEEE80211_CHAN_T)
 #define	IEEE80211_IS_CHAN_ST(_c) \
 	(((_c)->ic_flags & IEEE80211_CHAN_ST) == IEEE80211_CHAN_ST)
 #define	IEEE80211_IS_CHAN_108A(_c) \

==== //depot/projects/kmacy_wifi/sys/net80211/ieee80211.c#4 (text+ko) ====

@@ -151,6 +151,7 @@
 	if ((ic->ic_modecaps & (1<<m)) && ic->ic_sup_rates[m].rs_nrates == 0) \
 		ic->ic_sup_rates[m] = def; \
 } while (0)
+	struct ifnet *ifp = ic->ic_ifp;
 	struct ieee80211_channel *c;
 	int i;
 
@@ -183,7 +184,7 @@
 				ic->ic_modecaps |= 1<<IEEE80211_MODE_11G;
 			if (IEEE80211_IS_CHAN_FHSS(c))
 				ic->ic_modecaps |= 1<<IEEE80211_MODE_FH;
-			if (IEEE80211_IS_CHAN_T(c))
+			if (IEEE80211_IS_CHAN_TURBO(c))
 				ic->ic_modecaps |= 1<<IEEE80211_MODE_TURBO_A;
 			if (IEEE80211_IS_CHAN_108G(c))
 				ic->ic_modecaps |= 1<<IEEE80211_MODE_TURBO_G;