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 /include | |
| parent | ba0cc3c153590e3d31985b8f8914d205a20b0d7a (diff) | |
| parent | 2439ca0402091badb24415e1b073ba12b34ba423 (diff) | |
| download | lwn-ca25ebe550688e697764c76b06f406d9ea4b7d02.tar.gz lwn-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 'include')
| -rw-r--r-- | include/net/mac80211.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b4faadbb4e01..cca510a585c3 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -3620,7 +3620,8 @@ struct ieee80211_ops { int (*join_ibss)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); void (*leave_ibss)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); - u32 (*get_expected_throughput)(struct ieee80211_sta *sta); + u32 (*get_expected_throughput)(struct ieee80211_hw *hw, + struct ieee80211_sta *sta); int (*get_txpower)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, int *dbm); |