OSDN Git Service

staging: rtl8723au: rtw_cfg80211_add_wep(): Get rid of unused keyindex flags
authorJes Sorensen <Jes.Sorensen@redhat.com>
Wed, 21 May 2014 07:37:37 +0000 (09:37 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 23 May 2014 07:27:42 +0000 (16:27 +0900)
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c

index d89b400..bc27b59 100644 (file)
@@ -1935,16 +1935,12 @@ exit:
        return ret;
 }
 
-static int rtw_cfg80211_add_wep(struct rtw_adapterpadapter,
+static int rtw_cfg80211_add_wep(struct rtw_adapter *padapter,
                                struct ndis_802_11_wep *wep)
 {
-       u8 bdefaultkey;
-       u8 btransmitkey;
        int keyid, res;
        struct security_priv *psecuritypriv = &padapter->securitypriv;
 
-       bdefaultkey = (wep->KeyIndex & 0x40000000) > 0 ? false : true;
-       btransmitkey = (wep->KeyIndex & 0x80000000) > 0 ? true  : false;
        keyid = wep->KeyIndex & 0x3fffffff;
 
        if (keyid >= 4) {
@@ -2223,7 +2219,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
                }
 
                pwep->KeyIndex = wep_key_idx;
-               pwep->KeyIndex |= 0x80000000;
 
                memcpy(pwep->KeyMaterial, (void *)sme->key, pwep->KeyLength);