diff options
| author | David S. Miller <davem@davemloft.net> | 2014-03-04 01:42:47 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-04 01:42:47 +0400 |
| commit | 48235515c45c26159375df393d52c34a73bc6210 (patch) | |
| tree | 9bb36674471e64fe5d7c0a9cd3eb778009eff1a3 /drivers/net/macvlan.c | |
| parent | ec0223ec48a90cb605244b45f7c62de856403729 (diff) | |
| parent | 0c6a4812a0e1879daa6c8ac88e566dbb85e1ea70 (diff) | |
| download | linux-48235515c45c26159375df393d52c34a73bc6210.tar.xz | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
Please pull this batch of fixes intended for the 3.14 stream...
For the mac80211 bits, Johannes says:
"This time I have a fix to get out of an 'infinite error state' in case
regulatory domain updates failed and two fixes for VHT associations: one
to not disconnect immediately when the AP uses more bandwidth than the
new regdomain would allow after a change due to association country
information getting used, and one for an issue in the code where
mac80211 doesn't correctly ignore a reserved field and then uses an HT
instead of VHT association."
For the iwlwifi bits, Emmanuel says:
"Johannes fixes a long standing bug in the AMPDU status reporting.
Max fixes the listen time which was way too long and causes trouble
to several APs."
Along with those, Bing Zhao marks the mwifiex_usb driver as _not_
supporting USB autosuspend after a number of problems with that have
been reported.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/macvlan.c')
0 files changed, 0 insertions, 0 deletions