From 90c1076509496a2e728d3749c8115dc8c57be9dd Mon Sep 17 00:00:00 2001 From: MAACHE Mehdi Date: Wed, 21 Nov 2012 15:18:29 +0100 Subject: [PATCH] Staging: rtl8187se: remove check for IW_ENCODE_DISABLED The original code had a no-op stub where it checked if IW_ENCODE_DISABLED and did nothing. Then in a cleanup patch we accidentally turned the check on. That was: de171bd6ff "Staging: rtl8187se: r8180_wx: fixed a lot of checkpatch.pl issues". The check should just be removed. Signed-off-by: Mehdi MAACHE Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8187se/r8180_wx.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c index 52f63d75d248..156b75882290 100644 --- a/drivers/staging/rtl8187se/r8180_wx.c +++ b/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]; -- 2.34.1