diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-01 12:33:46 -0400 |
| commit | 0cb7bf61b1e9f05027de58c80f9b46a714d24e35 (patch) | |
| tree | 41fb55cf62d07b425122f9a8b96412c0d8eb99c5 /net/mac80211/driver-ops.h | |
| parent | aa877175e7a9982233ed8f10cb4bfddd78d82741 (diff) | |
| parent | 3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff) | |
Merge branch 'linus' into smp/hotplug
Apply upstream changes to avoid conflicts with pending patches.
Diffstat (limited to 'net/mac80211/driver-ops.h')
| -rw-r--r-- | net/mac80211/driver-ops.h | 2 |
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, | |||
| 1094 | 1094 | ||
| 1095 | trace_drv_get_expected_throughput(sta); | 1095 | trace_drv_get_expected_throughput(sta); |
| 1096 | if (local->ops->get_expected_throughput) | 1096 | if (local->ops->get_expected_throughput) |
| 1097 | ret = local->ops->get_expected_throughput(sta); | 1097 | ret = local->ops->get_expected_throughput(&local->hw, sta); |
| 1098 | trace_drv_return_u32(local, ret); | 1098 | trace_drv_return_u32(local, ret); |
| 1099 | 1099 | ||
| 1100 | return ret; | 1100 | return ret; |