From 0c4175f7e6265ec9801ea0f9c01d0ca11be330ae Mon Sep 17 00:00:00 2001 From: Jussi Kivilinna Date: Tue, 21 Dec 2010 22:44:12 +0200 Subject: [PATCH] --- yaml --- r: 225497 b: refs/heads/master c: 0b578021745b61b2ff89f6bacbac5db08a9a8089 h: refs/heads/master i: 225495: e946f6d79dc08702cf7064d6ecf154a5141d4dd2 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/rndis_wlan.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0361c4e08ac2..3eba347b7eba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfe3850b0cfca6ba64395e2705d9a51cd044f374 +refs/heads/master: 0b578021745b61b2ff89f6bacbac5db08a9a8089 diff --git a/trunk/drivers/net/wireless/rndis_wlan.c b/trunk/drivers/net/wireless/rndis_wlan.c index de4c05019f1e..9e6105cd54a5 100644 --- a/trunk/drivers/net/wireless/rndis_wlan.c +++ b/trunk/drivers/net/wireless/rndis_wlan.c @@ -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);