diff options
| author |  David S. Miller <davem@davemloft.net>
| 2015-01-19 16:22:19 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net>
| 2015-01-19 16:22:19 -0500 |
| commit | 0c49087462e8587c12ecfeaf1dd46fdc0ddc4532 (patch) | |
| tree | b91fa846e41c80cd948c9d8fa636bd352ed98a31 /drivers/net/can/usb/peak_usb/pcan_usb.c | |
| parent | phonet netlink: allow multiple messages per skb in route dump (diff) | |
| parent | mac80211: delete the assoc/auth timer upon suspend (diff) | |
| download | linux-0c49087462e8587c12ecfeaf1dd46fdc0ddc4532.tar.gz linux-0c49087462e8587c12ecfeaf1dd46fdc0ddc4532.tar.bz2 linux-0c49087462e8587c12ecfeaf1dd46fdc0ddc4532.zip | |
Merge tag 'mac80211-next-for-davem-2015-01-19' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-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
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/usb/peak_usb/pcan_usb.c')
0 files changed, 0 insertions, 0 deletions