diff options
| author | MAACHE Mehdi <mehdi.maache@gmail.com> | 2012-11-21 14:18:29 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 22:00:01 (GMT) |
| commit | 90c1076509496a2e728d3749c8115dc8c57be9dd (patch) | |
| tree | 855ea0199c8a940317d9112284635dac13720044 /drivers/staging/rtl8187se | |
| parent | 167989ba2eeff882a6e5afd74c409661cdbf3fc9 (diff) | |
| download | linux-fsl-qoriq-90c1076509496a2e728d3749c8115dc8c57be9dd.tar.xz | |
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 <mehdi.maache@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8187se')
| -rw-r--r-- | drivers/staging/rtl8187se/r8180_wx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/rtl8187se/r8180_wx.c b/drivers/staging/rtl8187se/r8180_wx.c index 52f63d7..156b758 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]; |