diff --git a/[refs] b/[refs]
index 3aedd6e34cad..a2a5cac158a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d92f83ffafe8e2ce105c3ec5696c62d6fcebcee
+refs/heads/master: 6274115ce9f0c87068761b2ba5b0b2f7d13c17cf
diff --git a/trunk/net/ieee80211/ieee80211_wx.c b/trunk/net/ieee80211/ieee80211_wx.c
index 0ea55cb5f172..a78c4f845f66 100644
--- a/trunk/net/ieee80211/ieee80211_wx.c
+++ b/trunk/net/ieee80211/ieee80211_wx.c
@@ -503,7 +503,7 @@ int ieee80211_wx_get_encode(struct ieee80211_device *ieee,
 	len = sec->key_sizes[key];
 	memcpy(keybuf, sec->keys[key], len);
 
-	erq->length = (len >= 0 ? len : 0);
+	erq->length = len;
 	erq->flags |= IW_ENCODE_ENABLED;
 
 	if (ieee->open_wep)