| Message ID | 20160815082400.12053-1-maxim.altshul@ti.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d8c872b57e0f71b5eccb83b06898d678c7f3353f |
| Delegated to: | Kalle Valo |
| Headers | show |
Maxim Altshul <maxim.altshul@ti.com> wrote: > 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 > get_expected_throughput op change (hw is now sent as a parameter) > > Signed-off-by: Maxim Altshul <maxim.altshul@ti.com> I'll change the end of commit log to: 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.
Maxim Altshul <maxim.altshul@ti.com> wrote: > 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> Thanks, 1 patch applied to wireless-drivers-next.git: d8c872b57e0f wlcore: Remove wl pointer from wl_sta structure
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 1ec3545..8589e5a 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -5043,7 +5043,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 3875190..8ee5206 100644 --- a/drivers/net/wireless/ti/wlcore/wlcore_i.h +++ b/drivers/net/wireless/ti/wlcore/wlcore_i.h @@ -352,7 +352,6 @@ struct wl1271_station { * Used in both AP and STA mode. */ u64 total_freed_pkts; - struct wl1271 *wl; }; struct wl12xx_vif {
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 get_expected_throughput op change (hw is now sent as a parameter) Signed-off-by: Maxim Altshul <maxim.altshul@ti.com> --- Changed the commit message to better explain the changey drivers/net/wireless/ti/wlcore/main.c | 1 - drivers/net/wireless/ti/wlcore/wlcore_i.h | 1 - 2 files changed, 2 deletions(-)