diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-04 16:00:55 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-04 16:00:55 -0400 |
| commit | b7ba7b469a4ffc2907c355a3c0873173567d9038 (patch) | |
| tree | b7fdeccae8bea26bbdaff824cfa75407f49fa9dc /include/net | |
| parent | 0650c0b8d9efe5b1205116a2febcb984c6c98472 (diff) | |
| parent | ff419b3f95ab7a97c5f72876b53f12a249dacc2a (diff) | |
| download | talos-obmc-linux-b7ba7b469a4ffc2907c355a3c0873173567d9038.tar.gz talos-obmc-linux-b7ba7b469a4ffc2907c355a3c0873173567d9038.zip | |
Merge tag 'mac80211-for-davem-2015-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg says:
====================
We have only a few fixes right now:
* a fix for an issue with hash collision handling in the
rhashtable conversion
* a merge issue - rhashtable removed default shrinking
just before mac80211 was converted, so enable it now
* remove an invalid WARN that can trigger with legitimate
userspace behaviour
* add a struct member missing from kernel-doc that caused
a lot of warnings
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/mac80211.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h index b4bef1152c05..8e3668b44c29 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1666,6 +1666,8 @@ struct ieee80211_tx_control { * @sta: station table entry, %NULL for per-vif queue * @tid: the TID for this queue (unused for per-vif queue) * @ac: the AC for this queue + * @drv_priv: data area for driver use, will always be aligned to + * sizeof(void *). * * The driver can obtain packets from this queue by calling * ieee80211_tx_dequeue(). |
