diff options
| author | David S. Miller | 2015-06-11 07:49:49 +0200 |
|---|---|---|
| committer | David S. Miller | 2015-06-11 07:49:49 +0200 |
| commit | 1edaa7e8a7e753bd42d795bf289a6488aeae7f56 (patch) | |
| tree | ecd7a95b747104cd797bdc5be1a3e7258e2d77c8 /net/ipv4 | |
| parent | net/unix: support SCM_SECURITY for stream sockets (diff) | |
| parent | mac80211: convert HW flags to unsigned long bitmap (diff) | |
| download | kernel-qcow2-linux-1edaa7e8a7e753bd42d795bf289a6488aeae7f56.tar.gz kernel-qcow2-linux-1edaa7e8a7e753bd42d795bf289a6488aeae7f56.tar.xz kernel-qcow2-linux-1edaa7e8a7e753bd42d795bf289a6488aeae7f56.zip | |
Merge tag 'mac80211-next-for-davem-2015-06-10' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says:
====================
For this round we mostly have fixes:
* mesh fixes from Alexis Green and Chun-Yeow Yeoh,
* a documentation fix from Jakub Kicinski,
* a missing channel release (from Michal Kazior),
* a fix for a signal strength reporting bug (from Sara Sharon),
* handle deauth while associating (myself),
* don't report mangled TX SKB back to userspace for status (myself),
* handle aggregation session timeouts properly in fast-xmit (myself)
However, there are also a few cleanups and one big change that
affects all drivers (and that required me to pull in your tree)
to change the mac80211 HW flags to use an unsigned long bitmap
so that we can extend them more easily - we're running out of
flags even with a cleanup to remove the two unused ones.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
0 files changed, 0 insertions, 0 deletions