PERFORCE change 152841 for review

[Sam Leffler]

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

Change 152841 by sam at sam_ebb on 2008/11/12 02:39:40

	IFC

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#22 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#28 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_sta.c#24 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_wds.c#12 integrate

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#22 (text+ko) ====

@@ -25,7 +25,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_adhoc.c,v 1.6 2008/10/27 16:46:50 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_adhoc.c,v 1.7 2008/10/30 16:22:04 sam Exp $");
 #endif
 
 /*
@@ -553,7 +553,7 @@
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
-		} else if ((ni->ni_ath_flags & IEEE80211_NODE_FF) &&
+		} else if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) &&
 #define	FF_LLC_SIZE	(sizeof(struct ether_header) + sizeof(struct llc))
 		    m->m_pkthdr.len >= 3*FF_LLC_SIZE) {
 			struct llc *llc;

==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#28 (text+ko) ====

@@ -25,7 +25,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_hostap.c,v 1.8 2008/10/26 01:04:46 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_hostap.c,v 1.9 2008/10/30 16:22:04 sam Exp $");
 #endif
 
 /*
@@ -752,7 +752,7 @@
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
-		} else if ((ni->ni_ath_flags & IEEE80211_NODE_FF) &&
+		} else if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) &&
 #define	FF_LLC_SIZE	(sizeof(struct ether_header) + sizeof(struct llc))
 		    m->m_pkthdr.len >= 3*FF_LLC_SIZE) {
 			struct llc *llc;

==== //depot/projects/vap/sys/net80211/ieee80211_sta.c#24 (text+ko) ====

@@ -25,7 +25,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_sta.c,v 1.10 2008/10/27 16:46:50 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_sta.c,v 1.11 2008/10/30 16:22:04 sam Exp $");
 #endif
 
 /*
@@ -795,7 +795,7 @@
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
-		} else if ((ni->ni_ath_flags & IEEE80211_NODE_FF) &&
+		} else if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) &&
 #define	FF_LLC_SIZE	(sizeof(struct ether_header) + sizeof(struct llc))
 		    m->m_pkthdr.len >= 3*FF_LLC_SIZE) {
 			struct llc *llc;

==== //depot/projects/vap/sys/net80211/ieee80211_wds.c#12 (text+ko) ====

@@ -25,7 +25,7 @@
 
 #include <sys/cdefs.h>
 #ifdef __FreeBSD__
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_wds.c,v 1.3 2008/09/21 23:00:19 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_wds.c,v 1.4 2008/10/30 16:22:04 sam Exp $");
 #endif
 
 /*
@@ -728,7 +728,7 @@
 			m = ieee80211_decap_amsdu(ni, m);
 			if (m == NULL)
 				return IEEE80211_FC0_TYPE_DATA;
-		} else if ((ni->ni_ath_flags & IEEE80211_NODE_FF) &&
+		} else if (IEEE80211_ATH_CAP(vap, ni, IEEE80211_NODE_FF) &&
 #define	FF_LLC_SIZE	(sizeof(struct ether_header) + sizeof(struct llc))
 		    m->m_pkthdr.len >= 3*FF_LLC_SIZE) {
 			struct llc *llc;