[Madwifi-cvs] revision 1983 committed

[Matthew W. S. B. <svn...@ma...>]

Project     : madwifi
Revision    : 1983
Author      : mentor (Matthew W. S. Bell)
Date        : 2007-01-20 23:01:17 +0100 (Sat, 20 Jan 2007)

Log Message :
Whitespace changes and a clarification comment about the data confidentiality 
service

Affected Files:
* trunk/ath/if_ath.c                                  updated             
* trunk/net80211/ieee80211_node.c                     updated             


Modified: trunk/ath/if_ath.c
===================================================================
--- trunk/ath/if_ath.c	2007-01-19 23:31:18 UTC (rev 1982)
+++ trunk/ath/if_ath.c	2007-01-20 22:01:17 UTC (rev 1983)
@@ -3260,10 +3260,10 @@
 	if (cip->ic_cipher == IEEE80211_CIPHER_TKIP &&
 	    (k->wk_flags & IEEE80211_KEY_SWMIC) == 0 && sc->sc_splitmic) {
 		ath_hal_keyreset(ah, keyix + 32);	/* RX key */
-		ni = sc->sc_keyixmap[keyix+32];
+		ni = sc->sc_keyixmap[keyix + 32];
 		if (ni != NULL) {			/* as above... */
 			ieee80211_free_node(ni);
-			sc->sc_keyixmap[keyix+32] = NULL;
+			sc->sc_keyixmap[keyix + 32] = NULL;
 		}
 	}
 
@@ -3273,10 +3273,10 @@
 		if (rxkeyoff != 0) {
 			ninfo->ni_rxkeyoff = 0;
 			ath_hal_keyreset(ah, keyix + rxkeyoff);
-			ni = sc->sc_keyixmap[keyix+rxkeyoff];
+			ni = sc->sc_keyixmap[keyix + rxkeyoff];
 			if (ni != NULL) {	/* as above... */
 				ieee80211_free_node(ni);
-				sc->sc_keyixmap[keyix+rxkeyoff] = NULL;
+				sc->sc_keyixmap[keyix + rxkeyoff] = NULL;
 			}
 		}
 	}

Modified: trunk/net80211/ieee80211_node.c
===================================================================
--- trunk/net80211/ieee80211_node.c	2007-01-19 23:31:18 UTC (rev 1982)
+++ trunk/net80211/ieee80211_node.c	2007-01-20 22:01:17 UTC (rev 1983)
@@ -467,7 +467,9 @@
 		if ((ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY) == 0)
 			fail |= 0x04;
 	} else {
-		/* XXX does this mean privacy is supported or required? */
+		/* This means that the data confidentiality service is required
+		 * for all frames exchanged within this BSS. (IEEE802.11 7.3.1.4) 
+		 */
 		if (ni->ni_capinfo & IEEE80211_CAPINFO_PRIVACY)
 			fail |= 0x04;
 	}