Thread: [Madwifi-cvs] madwifi/net80211 ieee80211_input.c,1.1.4.14,1.1.4.15
Status: Beta
Brought to you by:
otaku
From: Sam L. <sam...@us...> - 2004-07-27 17:35:59
|
Update of /cvsroot/madwifi/madwifi/net80211 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10406 Modified Files: Tag: WPA ieee80211_input.c Log Message: o use LE_READ_2 instead of equivalent code o move comment up in preparation for additional ie's Index: ieee80211_input.c =================================================================== RCS file: /cvsroot/madwifi/madwifi/net80211/Attic/ieee80211_input.c,v retrieving revision 1.1.4.14 retrieving revision 1.1.4.15 diff -C2 -d -r1.1.4.14 -r1.1.4.15 *** ieee80211_input.c 9 Jul 2004 21:01:47 -0000 1.1.4.14 --- ieee80211_input.c 27 Jul 2004 17:35:50 -0000 1.1.4.15 *************** *** 1561,1565 **** case IEEE80211_ELEMID_FHPARMS: if (ic->ic_phytype == IEEE80211_T_FH) { ! fhdwell = (frm[3] << 8) | frm[2]; chan = IEEE80211_FH_CHAN(frm[4], frm[5]); fhindex = frm[6]; --- 1561,1565 ---- case IEEE80211_ELEMID_FHPARMS: if (ic->ic_phytype == IEEE80211_T_FH) { ! fhdwell = LE_READ_2(&frm[2]); chan = IEEE80211_FH_CHAN(frm[4], frm[5]); fhindex = frm[6]; *************** *** 1732,1742 **** ni->ni_fhindex = fhindex; ni->ni_erp = erp; ! if (wpa != NULL) { ! /* ! * Record WPA/RSN information element for use by ! * applications like wpa_supplicant. ! */ ieee80211_saveie(&ni->ni_wpa_ie, wpa); - } /* NB: must be after ni_chan is setup */ ieee80211_setup_rates(ic, ni, rates, xrates, IEEE80211_F_DOSORT); --- 1732,1741 ---- ni->ni_fhindex = fhindex; ni->ni_erp = erp; ! /* ! * Record optional information elements that might be ! * used by applications or drivers. ! */ ! if (wpa != NULL) ieee80211_saveie(&ni->ni_wpa_ie, wpa); /* NB: must be after ni_chan is setup */ ieee80211_setup_rates(ic, ni, rates, xrates, IEEE80211_F_DOSORT); |