leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libertas: Don't set IW_ENCODE_NOKEY when returning WEP keys.

Browse Source 
Also clean up the double setting/clearing of IW_ENCODE_DISABLED.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
David Woodhouse 2007-12-07 19:32:12 +00:00 committed by David S. Miller
parent c2df2efe96
commit c12bdc45d9
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/wireless/libertas/wext.c
View File

@ -1122,14 +1122,6 @@ static int lbs_get_encode(struct net_device *dev,
break; break;
} }
if ( adapter->secinfo.wep_enabled
|| adapter->secinfo.WPAenabled
|| adapter->secinfo.WPA2enabled) {
dwrq->flags &= ~IW_ENCODE_DISABLED;
} else {
dwrq->flags |= IW_ENCODE_DISABLED;
}
memset(extra, 0, 16); memset(extra, 0, 16);
mutex_lock(&adapter->lock); mutex_lock(&adapter->lock);
@ -1150,14 +1142,13 @@ static int lbs_get_encode(struct net_device *dev,
|| (adapter->secinfo.WPA2enabled)) { || (adapter->secinfo.WPA2enabled)) {
/* return WPA enabled */ /* return WPA enabled */
dwrq->flags &= ~IW_ENCODE_DISABLED; dwrq->flags &= ~IW_ENCODE_DISABLED;
dwrq->flags |= IW_ENCODE_NOKEY;
} else { } else {
dwrq->flags |= IW_ENCODE_DISABLED; dwrq->flags |= IW_ENCODE_DISABLED;
} }
mutex_unlock(&adapter->lock); mutex_unlock(&adapter->lock);
dwrq->flags |= IW_ENCODE_NOKEY;
lbs_deb_wext("key: %02x:%02x:%02x:%02x:%02x:%02x, keylen %d\n", lbs_deb_wext("key: %02x:%02x:%02x:%02x:%02x:%02x, keylen %d\n",
extra[0], extra[1], extra[2], extra[0], extra[1], extra[2],
extra[3], extra[4], extra[5], dwrq->length); extra[3], extra[4], extra[5], dwrq->length);