summaryrefslogtreecommitdiff
path: root/net/mpls
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2014-04-18 22:29:44 (GMT)
committerDavid S. Miller <davem@davemloft.net>2014-04-18 22:29:44 (GMT)
commit5a292f7bc641bc16277173d1ff7cfe8cba298f00 (patch)
tree33f26cc9c42cada3b152666070521860dde43312 /net/mpls
parentba67b510035141bd89b40bf65efa0a79834311ca (diff)
parent4a0c3d9fd1af83ad0519997043467b817d3738fc (diff)
downloadlinux-5a292f7bc641bc16277173d1ff7cfe8cba298f00.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-04-17 Please pull this batch of fixes intended for the 3.15 stream... For the mac80211 bits, Johannes says: "We have a fix from Chun-Yeow to not look at management frame bitrates that are typically really low, two fixes from Felix for AP_VLAN interfaces, a fix from Ido to disable SMPS settings when a monitor interface is enabled, a radar detection fix from MichaƂ and a fix from myself for a very old remain-on-channel bug." For the iwlwifi bits, Emmanuel says: "I have new device IDs and a new firmware API. These are the trivial ones. The less trivial ones are Johannes's fix that delays the enablement of an interrupt coalescing hardware until after association - this fixes a few connection problems seen in the field. Eyal has a bunch of rate control fixes. I decided to add these for 3.15 because they fix some disconnection and packet loss scenarios which were reported by the field. I also have a fix for a memory leak that happens only with a very new NIC." Along with those... Amitkumar Karwar fixes a couple of problems relating to driver/firmware interactions in mwifiex. Christian Engelmayer avoids a couple of potential memory leaks in the new rsi driver. Eliad Peller provides a wl18xx mailbox alignment fix for problems when using new firmware. Frederic Danis adds a couple of missing debugging strings to the cw1200 driver. Geert Uytterhoeven adds a variable initialization inside of the rsi driver. Luciano Coelho patches the wlcore code to ignore dummy packet events in PLT mode in order to work around a firmware bug. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mpls')
0 files changed, 0 insertions, 0 deletions