---

yaml --- r: 225497 b: refs/heads/master c: 0b57802 h: refs/heads/master i: 225495: e946f6d v: v3
git-mirror · Dec 22, 2010 · 0c4175f · 0c4175f
1 parent 2d72d71
commit 0c4175f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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);