KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hostapd: back out a problematic madwifi change that worked around some issues with wep in madwifi (which may no longer be necessary), but broke dynamic WEP in AP mode (fixes #8267)

Browse source 
SVN-Revision: 24032
This commit is contained in:
Felix Fietkau 2010-11-19 00:57:41 +00:00
parent a9ef165cff
commit a72af79590
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
package/hostapd/patches/340-madwifi_key_fixes.patch
View file

@ -1,20 +1,6 @@
--- a/src/drivers/driver_madwifi.c --- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c +++ b/src/drivers/driver_madwifi.c
@@ -438,9 +438,11 @@ madwifi_set_key(const char *ifname, void @@ -464,15 +464,30 @@ madwifi_set_key(const char *ifname, void
wpa_printf(MSG_DEBUG, "%s: alg=%d addr=%s key_idx=%d",
__func__, alg, ether_sprintf(addr), key_idx);
- if (alg == WPA_ALG_WEP)
+ if (alg == WPA_ALG_WEP) {
cipher = IEEE80211_CIPHER_WEP;
- else if (alg == WPA_ALG_TKIP)
+ if (!addr || !memcmp(addr, "\xff\xff\xff\xff\xff\xff", ETH_ALEN))
+ return wpa_driver_wext_set_key(ifname, drv->wext, alg, addr, key_idx, set_tx, seq, seq_len, key, key_len);
+ } else if (alg == WPA_ALG_TKIP)
cipher = IEEE80211_CIPHER_TKIP;
else if (alg == WPA_ALG_CCMP)
cipher = IEEE80211_CIPHER_AES_CCM;
@@ -464,15 +466,30 @@ madwifi_set_key(const char *ifname, void
memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN); memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
wk.ik_keyix = key_idx; wk.ik_keyix = key_idx;
wk.ik_flags |= IEEE80211_KEY_DEFAULT; wk.ik_flags |= IEEE80211_KEY_DEFAULT;