wlcore: Remove wl pointer from wl_sta structure

This field was added to wl_sta struct to get hw in situations
where it was not given to driver by mac80211. In our case,
get_expected_throughput op did not send hw to driver.

This patch reverts the change, as it is no longer needed due to commit
4fdbc67a25ce ("mac80211: call get_expected_throughput only after adding
station") as hw is now sent as a parameter.

Signed-off-by: Maxim Altshul <maxim.altshul@ti.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c
index 9e1f2d9c98659279d85c914247c7b7f95a62b8c7..ef6c15b952cc8bcc91760b5011b8e41aafe6e94c 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/main.c
+++ b/drivers/net/wireless/ti/wlcore/main.c
@@ -4986,7 +4986,6 @@ static int wl12xx_sta_add(struct wl1271 *wl,
                return ret;
 
        wl_sta = (struct wl1271_station *)sta->drv_priv;
-       wl_sta->wl = wl;
        hlid = wl_sta->hlid;
 
        ret = wl12xx_cmd_add_peer(wl, wlvif, sta, hlid);

diff --git a/drivers/net/wireless/ti/wlcore/wlcore_i.h b/drivers/net/wireless/ti/wlcore/wlcore_i.h
index 242b4e37b94c3504b102312e328566e51c5b555d..0277ae508b8a6ebb6640a0a871465dc9fb3817f8 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/wlcore_i.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h
@@ -347,7 +347,6 @@ struct wl1271_station {
         * Used in both AP and STA mode.
         */
        u64 total_freed_pkts;
-       struct wl1271 *wl;
 };
 
 struct wl12xx_vif {