diff options
| author |   Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-01-20 09:11:39 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-01-22 17:54:10 +0200 |
| commit | 7fe3016f24296ec88100113c9671fa605a71c44e (patch) | |
| tree | aac88623447c95badc6b0ffa1874b6b6b05ad616 /include/uapi/linux/errqueue.h | |
| parent | iwlwifi: mvm: ignore temperature updates in the RX statistics notification (diff) | |
| parent | mac80211: delete the assoc/auth timer upon suspend (diff) | |
Merge tag 'tags/mac80211-next-for-davem-2015-01-19' into iwlwifi-next
Some further updates for net-next:
* fix network-manager which was broken by the previous changes
* fix delete-station events, which were broken by me making the
genlmsg_end() mistake
* fix a timer left running during suspend in some race conditions
that would cause an annoying (but harmless) warning
* (less important, but in the tree already) remove 80+80 MHz rate
reporting since the spec doesn't distinguish it from 160 MHz;
as the bitrate they're both 160 MHz bandwidth
Diffstat (limited to 'include/uapi/linux/errqueue.h')
0 files changed, 0 insertions, 0 deletions