diff options
author | David S. Miller <davem@davemloft.net> | 2014-07-02 06:47:33 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-02 06:47:33 (GMT) |
commit | eb608d2b99d993a4b4ee9cb70e6cf66f96bb1168 (patch) | |
tree | 0f6dfa1dd1616bed670de8b0bed540a37adfa66f /net/unix/af_unix.c | |
parent | b758858c5ceb1b30ae7d04dea6c74821bd7c7d69 (diff) | |
parent | f9fa39e9ace5a8abbe9597c2970828ced67261da (diff) | |
download | linux-eb608d2b99d993a4b4ee9cb70e6cf66f96bb1168.tar.xz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says:
====================
pull request: wireless 2014-06-27
Please pull the following batch of fixes for the 3.16 stream...
For the mac80211 bits, Johannes says:
"We have a fix from Eliad for a time calculation, a fix from Max for
head/tailroom when sending authentication packets, a revert that Felix
requested since the patch in question broke regulatory and a fix from
myself for an issue with a new command that we advertised in the wrong
place."
For the bluetooth bits, Gustavo says:
"A few fixes for 3.16. This pull request contains a NULL dereference fix,
and some security/pairing fixes."
For the iwlwifi bits, Emmanuel says:
"I have here a fix from Eliad for scheduled scan: it fixes a firmware
assertion. Arik reverts a patch I made that didn't take into account
that 3160 doesn't have UAPSD and hence, we can't assume that all
newer firmwares support the feature. Here too, the visible effect
is a firmware assertion. Along with that, we have a few fixes and
additions to the device list."
For the ath10k bits, Kalle says:
"Bartosz fixed an issue where we were not able to create 8 vdevs when
using DFS. Michal removed a false warning which was just confusing
people."
On top of that...
Arend van Spriel fixes a 'divide by zero' regression in brcmfmac.
Amitkumar Karwar corrects a transmit timeout in mwifiex.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions