Merge tag 'staging-3.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[pandora-kernel.git] / drivers / staging / rtl8723au / os_dep / ioctl_cfg80211.c

diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
index c5800ae..537bd82 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
@@ -1468,9 +1468,8 @@ static int rtw_cfg80211_set_wpa_version(struct security_priv *psecuritypriv,
                return 0;
        }
 
-       if (wpa_version & (NL80211_WPA_VERSION_1 | NL80211_WPA_VERSION_2)) {
+       if (wpa_version & (NL80211_WPA_VERSION_1 | NL80211_WPA_VERSION_2))
                psecuritypriv->ndisauthtype = Ndis802_11AuthModeWPAPSK;
-       }
 
 /*
        if (wpa_version & NL80211_WPA_VERSION_2)