diff --git a/[refs] b/[refs]
index fe6f22f17e1d..b67670f7704f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 167989ba2eeff882a6e5afd74c409661cdbf3fc9
+refs/heads/master: 90c1076509496a2e728d3749c8115dc8c57be9dd
diff --git a/trunk/drivers/staging/rtl8187se/r8180_wx.c b/trunk/drivers/staging/rtl8187se/r8180_wx.c
index 52f63d75d248..156b75882290 100644
--- a/trunk/drivers/staging/rtl8187se/r8180_wx.c
+++ b/trunk/drivers/staging/rtl8187se/r8180_wx.c
@@ -59,8 +59,6 @@ int r8180_wx_set_key(struct net_device *dev, struct iw_request_info *info,
 	if (priv->ieee80211->bHwRadioOff)
 		return 0;
 
-	if (erq->flags & IW_ENCODE_DISABLED)
-
 	if (erq->length > 0) {
 		u32* tkey = (u32*) key;
 		priv->key0[0] = tkey[0];