diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-08-06 20:52:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-08-06 20:52:00 -0400 |
| commit | ca25ebe550688e697764c76b06f406d9ea4b7d02 (patch) | |
| tree | 2f17e902221034b2180e72a22d9ff445c511995b /drivers/net | |
| parent | samples/bpf: add bpf_map_update_elem() tests (diff) | |
| parent | mac80211: Add ieee80211_hw pointer to get_expected_throughput (diff) | |
| download | linux-dev-ca25ebe550688e697764c76b06f406d9ea4b7d02.tar.xz linux-dev-ca25ebe550688e697764c76b06f406d9ea4b7d02.zip | |
Merge tag 'mac80211-for-davem-2016-08-05' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
First set of fixes for the current cycle:
* fix 80+80 bandwidth warning
* fix powersave with mac80211 TXQ implementation
* use correct way to free SKBs from multicast buffering
* mesh: fix operation ordering to work with all drivers
* mesh: end service period even when peer goes away
* mesh: correct HT opmode validity checks
* pass hw pointer from mac80211 to driver in TPT method,
fixing a bug (in a bit the wrong way, but that's what
we have right now)
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 1d689169da76..9e1f2d9c9865 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -5700,10 +5700,11 @@ out: mutex_unlock(&wl->mutex); } -static u32 wlcore_op_get_expected_throughput(struct ieee80211_sta *sta) +static u32 wlcore_op_get_expected_throughput(struct ieee80211_hw *hw, + struct ieee80211_sta *sta) { struct wl1271_station *wl_sta = (struct wl1271_station *)sta->drv_priv; - struct wl1271 *wl = wl_sta->wl; + struct wl1271 *wl = hw->priv; u8 hlid = wl_sta->hlid; /* return in units of Kbps */ |