staging: rtl8723au: struct rtw_wdev_priv: Remove some never 'true' variables

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/include/ioctl_cfg80211.h b/drivers/staging/rtl8723au/include/ioctl_cfg80211.h
index 5fc710b0f410f851271d89dd674da041b98ae48d..e1eaf9c29e8abcf35330d8b971a97e03da421749 100644 (file)
--- a/drivers/staging/rtl8723au/include/ioctl_cfg80211.h
+++ b/drivers/staging/rtl8723au/include/ioctl_cfg80211.h
@@ -28,9 +28,6 @@ struct rtw_wdev_priv {
 
        u8 p2p_enabled;
 
-       u8 provdisc_req_issued;
-
-       bool block;
        bool power_mgmt;
 };
 

diff --git a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
index 6b9bf16a76ea9ea0d1eeb751fc3821c5ef041675..017ea44ee433519224634797d339aba6a6429aca 100644 (file)
--- a/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
+++ b/drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c
@@ -2012,12 +2012,6 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
        DBG_8723A("privacy =%d, key =%p, key_len =%d, key_idx =%d\n",
                  sme->privacy, sme->key, sme->key_len, sme->key_idx);
 
-       if (wdev_to_priv(padapter->rtw_wdev)->block) {
-               ret = -EBUSY;
-               DBG_8723A("%s wdev_priv.block is set\n", __func__);
-               goto exit;
-       }
-
        if (_FAIL == rtw_pwr_wakeup(padapter)) {
                ret = -EPERM;
                goto exit;
@@ -3406,7 +3400,6 @@ int rtw_wdev_alloc(struct rtw_adapter *padapter, struct device *dev)
        spin_lock_init(&pwdev_priv->scan_req_lock);
 
        pwdev_priv->p2p_enabled = false;
-       pwdev_priv->provdisc_req_issued = false;
 
        if (padapter->registrypriv.power_mgnt != PS_MODE_ACTIVE)
                pwdev_priv->power_mgmt = true;