Merge commit 'c1e140bf79d817d4a7aa9932eb98b0359c87af33' from mac80211-next

[cascardo/linux.git] / drivers / net / wireless / ath / wil6210 / cfg80211.c

diff --git a/drivers/net/wireless/ath/wil6210/cfg80211.c b/drivers/net/wireless/ath/wil6210/cfg80211.c
index e72a95d..bd013fd 100644 (file)
--- a/drivers/net/wireless/ath/wil6210/cfg80211.c
+++ b/drivers/net/wireless/ath/wil6210/cfg80211.c
@@ -162,7 +162,7 @@ int wil_cid_fill_sinfo(struct wil6210_priv *wil, int cid,
        sinfo->tx_packets = stats->tx_packets;
        sinfo->tx_failed = stats->tx_errors;
 
        sinfo->tx_packets = stats->tx_packets;
        sinfo->tx_failed = stats->tx_errors;
 

-       if (test_bit(wil_status_fwconnected, &wil->status)) {
+       if (test_bit(wil_status_fwconnected, wil->status)) {

                sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
                sinfo->signal = reply.evt.sqi;
        }
                sinfo->filled |= BIT(NL80211_STA_INFO_SIGNAL);
                sinfo->signal = reply.evt.sqi;
        }


@@ -282,7 +282,7 @@ static int wil_cfg80211_scan(struct wiphy *wiphy,
        }
 
        /* FW don't support scan after connection attempt */
        }
 
        /* FW don't support scan after connection attempt */

-       if (test_bit(wil_status_dontscan, &wil->status)) {
+       if (test_bit(wil_status_dontscan, wil->status)) {

                wil_err(wil, "Can't scan now\n");
                return -EBUSY;
        }
                wil_err(wil, "Can't scan now\n");
                return -EBUSY;
        }


@@ -362,8 +362,8 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
        int ch;
        int rc = 0;
 
        int ch;
        int rc = 0;
 

-       if (test_bit(wil_status_fwconnecting, &wil->status) ||
-           test_bit(wil_status_fwconnected, &wil->status))
+       if (test_bit(wil_status_fwconnecting, wil->status) ||
+           test_bit(wil_status_fwconnected, wil->status))

                return -EALREADY;
 
        wil_print_connect_params(wil, sme);
                return -EALREADY;
 
        wil_print_connect_params(wil, sme);


@@ -450,7 +450,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
        memcpy(conn.bssid, bss->bssid, ETH_ALEN);
        memcpy(conn.dst_mac, bss->bssid, ETH_ALEN);
 
        memcpy(conn.bssid, bss->bssid, ETH_ALEN);
        memcpy(conn.dst_mac, bss->bssid, ETH_ALEN);
 

-       set_bit(wil_status_fwconnecting, &wil->status);
+       set_bit(wil_status_fwconnecting, wil->status);

 
        rc = wmi_send(wil, WMI_CONNECT_CMDID, &conn, sizeof(conn));
        if (rc == 0) {
 
        rc = wmi_send(wil, WMI_CONNECT_CMDID, &conn, sizeof(conn));
        if (rc == 0) {


@@ -458,7 +458,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy,
                mod_timer(&wil->connect_timer,
                          jiffies + msecs_to_jiffies(2000));
        } else {
                mod_timer(&wil->connect_timer,
                          jiffies + msecs_to_jiffies(2000));
        } else {

-               clear_bit(wil_status_fwconnecting, &wil->status);
+               clear_bit(wil_status_fwconnecting, wil->status);

        }
 
  out:
        }
 
  out: