Date: Mon, 8 Aug 2005 20:10:29 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 81675 for review Message-ID: <200508082010.j78KATeg047108@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=81675 Change 81675 by sam@sam_ebb on 2005/08/08 20:10:01 fixup mis-merges Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#61 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#32 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#2 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#18 (text+ko) ==== @@ -423,11 +423,6 @@ ic->ic_stats.is_crypto_delkey++; /* XXX recovery? */ } - /* - * Clear any unicast key index -> node mapping. - */ - if ((key->wk_flags & IEEE80211_KEY_GROUP) == 0) - ieee80211_node_delkey(&ic->ic_sta, keyix); } cipher_detach(key); memset(key, 0, sizeof(*key)); ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#61 (text+ko) ==== @@ -2062,13 +2062,13 @@ ic->ic_stats.is_rx_chanmismatch++; return; } - if (!(IEEE80211_BINTVAL_MIN <= bintval && - bintval <= IEEE80211_BINTVAL_MAX)) { + if (!(IEEE80211_BINTVAL_MIN <= scan.bintval && + scan.bintval <= IEEE80211_BINTVAL_MAX)) { IEEE80211_DISCARD(ic, IEEE80211_MSG_ELEMID | IEEE80211_MSG_INPUT, wh, ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], - "bogus beacon interval", bintval); + "bogus beacon interval", scan.bintval); ic->ic_stats.is_rx_badbintval++; return; } ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#32 (text+ko) ==== @@ -224,8 +224,6 @@ ieee80211_scan_lock_t nt_scanlock; /* on nt_scangen */ u_int nt_scangen; /* gen# for timeout scan */ int nt_inact_init; /* initial node inact setting */ - struct ieee80211_node **nt_keyixmap; /* key ix -> node map */ - int nt_keyixmax; /* keyixmap size */ }; struct ieee80211_node *ieee80211_alloc_node( ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#2 (text+ko) ==== @@ -125,7 +125,7 @@ u_int8_t bchan; u_int8_t fhindex; u_int8_t erp; - u_int8_t bintval; + u_int16_t bintval; u_int8_t timoff; u_int8_t *tim; u_int8_t *tstamp;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200508082010.j78KATeg047108>