summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-19 00:57:41 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-19 00:57:41 +0000
commitd0cdb27a601213f304f9ccfe2126810fd4d713a3 (patch)
treeec46850e498f8ac3f783acef596fe0a0437dba21
parent51bea45f82cd3aadb926d7ab28545191c8458ddc (diff)
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)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24032 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/hostapd/patches/340-madwifi_key_fixes.patch16
1 files changed, 1 insertions, 15 deletions
diff --git a/package/hostapd/patches/340-madwifi_key_fixes.patch b/package/hostapd/patches/340-madwifi_key_fixes.patch
index d6883ffce..7eca91fc1 100644
--- a/package/hostapd/patches/340-madwifi_key_fixes.patch
+++ b/package/hostapd/patches/340-madwifi_key_fixes.patch
@@ -1,20 +1,6 @@
--- a/src/drivers/driver_madwifi.c
+++ b/src/drivers/driver_madwifi.c
-@@ -438,9 +438,11 @@ 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
+@@ -464,15 +464,30 @@ madwifi_set_key(const char *ifname, void
memset(wk.ik_macaddr, 0xff, IEEE80211_ADDR_LEN);
wk.ik_keyix = key_idx;
wk.ik_flags |= IEEE80211_KEY_DEFAULT;