diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-09-28 10:41:59 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-09-28 10:41:59 -0700 |
| commit | 05c5e9ff22e33cb9706b20fd3cf33b802f7edbf6 (patch) | |
| tree | e821f0ae04c1fc331e7e251fbe47b6db47b51bb4 /include/net | |
| parent | qed: Fix shmem structure inconsistency between driver and the mfw. (diff) | |
| parent | nl80211: Fix possible Spectre-v1 for CQM RSSI thresholds (diff) | |
| download | linux-dev-05c5e9ff22e33cb9706b20fd3cf33b802f7edbf6.tar.xz linux-dev-05c5e9ff22e33cb9706b20fd3cf33b802f7edbf6.zip | |
Merge tag 'mac80211-for-davem-2018-09-27' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
More patches than I'd like perhaps, but each seems reasonable:
* two new spectre-v1 mitigations in nl80211
* TX status fix in general, and mesh in particular
* powersave vs. offchannel fix
* regulatory initialization fix
* fix for a queue hang due to a bad return value
* allocate TXQs for active monitor interfaces, fixing my
earlier patch to avoid unnecessary allocations where I
missed this case needed them
* fix TDLS data frames priority assignment
* fix scan results processing to take into account duplicate
channel numbers (over different operating classes, but we
don't necessarily know the operating class)
* various hwsim fixes for radio destruction and new radio
announcement messages
* remove an extraneous kernel-doc line
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/cfg80211.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 8ebabc9873d1..4de121e24ce5 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h @@ -4852,8 +4852,6 @@ const char *reg_initiator_name(enum nl80211_reg_initiator initiator); * * @alpha2: the ISO/IEC 3166 alpha2 wmm rule to be queried. * @freq: the freqency(in MHz) to be queried. - * @ptr: pointer where the regdb wmm data is to be stored (or %NULL if - * irrelevant). This can be used later for deduplication. * @rule: pointer to store the wmm rule from the regulatory db. * * Self-managed wireless drivers can use this function to query |