summaryrefslogtreecommitdiffstats
path: root/net/nfc/digital_core.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-09-12 18:21:47 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-12 18:21:47 -0400
commitcffc6c4c9484273e014bd0fbe5f9423f89feb87b (patch)
tree7418245675e79a622e972e472a458cf2dd2efff2 /net/nfc/digital_core.c
parenta7f8289d1291a8e1b9d4e39c770467d3dac0d382 (diff)
parentae0fd6354134e63aa3e62456e2080c430287144d (diff)
downloadlinux-cffc6c4c9484273e014bd0fbe5f9423f89feb87b.tar.bz2
Merge tag 'master-2014-09-11' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
John W. Linville says: ==================== pull request: wireless 2014-09-11 Please pull this batch of fixes intended for the 3.17 stream: For the mac80211 bits, Johannes says: "Two more fixes for mac80211 - one of them addresses a long-standing issue that we only found when using vendor events more frequently; the other addresses some bad information being reported in userspace that people were starting to actually look at." For the iwlwifi bits, Emmanuel says: "I re-enable scheduled scan on firmware that contain the fix for the bug that Linus reported. A few trivial fixes: endianity issues, the same DTIM period fix that I did in mac80211. Eyal fixes a few issues we identified with EAPOL, we now send them just as if they were management frames, this solves interrop issues. Johannes has another set of trivial fixes, while Luca fixes the way we configure the filters in the firmware. Last but not least, a new device is added by Oren." Emmanuel was traveling, resulting in his pull to be a bit larger than I would have liked to see at this point. FWIW, I have asked Emmanuel to be much more strict for any more pull requests in this cycle. In addition to the above, Sujith Manoharan reverts an earlier ath9k patch. The earlier change was found to allow for the device to sleep too long and miss beacons. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc/digital_core.c')
0 files changed, 0 insertions, 0 deletions