Commit 0b578021 authored Dec 21, 2010 by Jussi Kivilinna Committed by John W. Linville Dec 22, 2010

rndis_wlan: do not set default_key if not WEP key



rndis_set_default_key did call add_wep_key to set default key on device, even
if key is WPA. This caused rndis_wlan not work with wpa_supplicant in nl80211
mode (causing disconnect from AP).

Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent bfe3850b

drivers/net/wireless/rndis_wlan.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -2435,6 +2435,9 @@ static int rndis_set_default_key(struct wiphy wiphy, struct net_device netdev,

		priv->encr_tx_key_index = key_index;

		if (is_wpa_key(priv, key_index))
		return 0;

		key = priv->encr_keys[key_index];

		return add_wep_key(usbdev, key.material, key.len, key_index);

Admin message