summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMaxim Altshul <maxim.altshul@ti.com>2016-08-04 14:43:04 +0200
committerJohannes Berg <johannes.berg@intel.com>2016-08-05 14:23:25 +0200
commit2439ca0402091badb24415e1b073ba12b34ba423 (patch)
treebee78c393a782b2cd1cdd5f44d35406e6183aecd /net
parentnl80211: correct checks for NL80211_MESHCONF_HT_OPMODE value (diff)
downloadlinux-2439ca0402091badb24415e1b073ba12b34ba423.tar.xz
linux-2439ca0402091badb24415e1b073ba12b34ba423.zip
mac80211: Add ieee80211_hw pointer to get_expected_throughput
The variable is added to allow the driver an easy access to it's own hw->priv when the op is invoked. This fixes a crash in wlcore because it was relying on a station pointer that wasn't initialized yet. It's the wrong way to fix the crash, but it solves the problem for now and it does make sense to have the hw pointer here. Signed-off-by: Maxim Altshul <maxim.altshul@ti.com> [rewrite commit message, fix indentation] Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/driver-ops.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 184473c257eb..ba5fc1f01e53 100644
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -1094,7 +1094,7 @@ static inline u32 drv_get_expected_throughput(struct ieee80211_local *local,
trace_drv_get_expected_throughput(sta);
if (local->ops->get_expected_throughput)
- ret = local->ops->get_expected_throughput(sta);
+ ret = local->ops->get_expected_throughput(&local->hw, sta);
trace_drv_return_u32(local, ret);
return ret;