tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge rsync://bughost.org/repos/ieee80211-delta/

Jeff Garzik f24e0975 d7eaee08

+10 -6
+1 -1
include/net/ieee80211.h
··· 29 29 #include <linux/kernel.h> /* ARRAY_SIZE */ 30 30 #include <linux/wireless.h> 31 31 32 - #define IEEE80211_VERSION "git-1.1.6" 32 + #define IEEE80211_VERSION "git-1.1.7" 33 33 34 34 #define IEEE80211_DATA_LEN 2304 35 35 /* Maximum size for the MA-UNITDATA primitive, 802.11 standard section
+9 -5
net/ieee80211/ieee80211_wx.c
··· 161 161 (ieee->perfect_rssi - ieee->worst_rssi) - 162 162 (ieee->perfect_rssi - network->stats.rssi) * 163 163 (15 * (ieee->perfect_rssi - ieee->worst_rssi) + 164 - 62 * (ieee->perfect_rssi - network->stats.rssi))) / 165 - ((ieee->perfect_rssi - ieee->worst_rssi) * 166 - (ieee->perfect_rssi - ieee->worst_rssi)); 164 + 62 * (ieee->perfect_rssi - 165 + network->stats.rssi))) / 166 + ((ieee->perfect_rssi - 167 + ieee->worst_rssi) * (ieee->perfect_rssi - 168 + ieee->worst_rssi)); 167 169 if (iwe.u.qual.qual > 100) 168 170 iwe.u.qual.qual = 100; 169 171 else if (iwe.u.qual.qual < 1) ··· 522 520 crypt = &ieee->crypt[idx]; 523 521 group_key = 1; 524 522 } else { 525 - if (idx != 0) 523 + /* some Cisco APs use idx>0 for unicast in dynamic WEP */ 524 + if (idx != 0 && ext->alg != IW_ENCODE_ALG_WEP) 526 525 return -EINVAL; 527 526 if (ieee->iw_mode == IW_MODE_INFRA) 528 527 crypt = &ieee->crypt[idx]; ··· 691 688 } else 692 689 idx = ieee->tx_keyidx; 693 690 694 - if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY) 691 + if (!ext->ext_flags & IW_ENCODE_EXT_GROUP_KEY && 692 + ext->alg != IW_ENCODE_ALG_WEP) 695 693 if (idx != 0 || ieee->iw_mode != IW_MODE_INFRA) 696 694 return -EINVAL; 697 695