From af37915edc18dd20394def2863709490731eb7ca Mon Sep 17 00:00:00 2001
From: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Date: Thu, 18 Feb 2010 13:25:50 +0200
Subject: [PATCH] --- yaml --- r: 184469 b: refs/heads/master c:
 ee444cf0501183df1640cd35bebd4250989bfe99 h: refs/heads/master i:   184467:
 d95ef6a742a9e667b2f52d249ccd569d0c3088b4 v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1271_main.c | 8 ++++++++
 trunk/drivers/net/wireless/wl12xx/wl1271_tx.c   | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6b4ce2ac6242..fcfd822a78e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fddc7dd7deaa400db314b214d92de95f865a8af0
+refs/heads/master: ee444cf0501183df1640cd35bebd4250989bfe99
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
index 4a0a15bcd67e..459d9a0931f4 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -1475,6 +1475,14 @@ static int wl1271_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 			wl1271_error("Could not add or replace key");
 			goto out_sleep;
 		}
+
+		/* the default WEP key needs to be configured at least once */
+		if (key_type == KEY_WEP) {
+			ret = wl1271_cmd_set_default_wep_key(wl,
+							     wl->default_key);
+			if (ret < 0)
+				goto out_sleep;
+		}
 		break;
 
 	case DISABLE_KEY:
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c b/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c
index f6815a9239e5..f9e06385d9fe 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1271_tx.c
@@ -203,6 +203,7 @@ static int wl1271_tx_frame(struct wl1271 *wl, struct sk_buff *skb)
 			ret = wl1271_cmd_set_default_wep_key(wl, idx);
 			if (ret < 0)
 				return ret;
+			wl->default_key = idx;
 		}
 	}