aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2013-01-14 10:27:10 -0600
committerLinus Torvalds2013-01-14 10:27:10 -0600
commit6843cc0e0f59643d75a624999012b4dd72bfe1cf (patch)
tree6924ab19725e67b3f35f90277b2b670d0f0e0958 /MAINTAINERS
parent7c8284c3aa127ffe72a90a1bad52183ec9ad870a (diff)
parentd0b9cec3e27d0e9fda2fbf6aaacece68c99b1104 (diff)
downloadkernel-audio-6843cc0e0f59643d75a624999012b4dd72bfe1cf.tar.gz
kernel-audio-6843cc0e0f59643d75a624999012b4dd72bfe1cf.tar.xz
kernel-audio-6843cc0e0f59643d75a624999012b4dd72bfe1cf.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: 1) Fix regression allowing IP_TTL setting of zero, fix from Cong Wang. 2) Fix leak regressions in tunap, from Jason Wang. 3) be2net driver always returns IRQ_HANDLED in INTx handler, fix from Sathya Perla. 4) qlge doesn't really support NETIF_F_TSO6, don't set that flag. Fix from Amerigo Wang. 5) Add 802.11ad Atheros wil6210 driver, from Vladimir Kondratiev. 6) Fix MTU calculations in mac80211 layer, from T Krishna Chaitanya. 7) Station info layer of mac80211 needs to use del_timer_sync(), from Johannes Berg. 8) tcp_read_sock() can loop forever, because we don't immediately stop when recv_actor() returns zero. Fix from Eric Dumazet. 9) Fix WARN_ON() in tcp_cleanup_rbuf(). We have to use sk_eat_skb() in tcp_recv_skb() to handle the case where a large GRO packet is split up while it is use by a splice() operation. Fix also from Eric Dumazet. 10) addrconf_get_prefix_route() in ipv6 tests flags incorrectly, it does: if (X && (p->flags & Y) != 0) when it really meant to go: if (X && (p->flags & X) != 0) fix from Romain Kuntz. 11) Fix lost Kconfig dependency for bfin_mac driver hardware timestamping. From Lars-Peter Clausen. 12) Fix regression in handling of RST without ACK in TCP, from Eric Dumazet. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (37 commits) be2net: fix unconditionally returning IRQ_HANDLED in INTx tuntap: fix leaking reference count tuntap: forbid calling TUNSETIFF when detached tuntap: switch to use rtnl_dereference() net, wireless: overwrite default_ethtool_ops qlge: remove NETIF_F_TSO6 flag tcp: accept RST without ACK flag net: ethernet: xilinx: Do not use NO_IRQ in axienet net: ethernet: xilinx: Do not use axienet on PPC bnx2x: Allow management traffic after boot from SAN bnx2x: Fix fastpath structures when memory allocation fails bfin_mac: Restore hardware time-stamping dependency on BF518 tun: avoid owner checks on IFF_ATTACH_QUEUE bnx2x: move debugging code before the return tuntap: refuse to re-attach to different tun_struct ipv6: use addrconf_get_prefix_route for prefix route lookup [v2] ipv6: fix the noflags test in addrconf_get_prefix_route tcp: fix splice() and tcp collapsing interaction tcp: splice: fix an infinite loop in tcp_read_sock() net: prevent setting ttl=0 via IP_TTL ...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 51ff2aea8a32..cd5b31fec01c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1351,6 +1351,14 @@ W: http://wireless.kernel.org/en/users/Drivers/ath9k
1351S: Supported 1351S: Supported
1352F: drivers/net/wireless/ath/ath9k/ 1352F: drivers/net/wireless/ath/ath9k/
1353 1353
1354WILOCITY WIL6210 WIRELESS DRIVER
1355M: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
1356L: linux-wireless@vger.kernel.org
1357L: wil6210@qca.qualcomm.com
1358S: Supported
1359W: http://wireless.kernel.org/en/users/Drivers/wil6210
1360F: drivers/net/wireless/ath/wil6210/
1361
1354CARL9170 LINUX COMMUNITY WIRELESS DRIVER 1362CARL9170 LINUX COMMUNITY WIRELESS DRIVER
1355M: Christian Lamparter <chunkeey@googlemail.com> 1363M: Christian Lamparter <chunkeey@googlemail.com>
1356L: linux-wireless@vger.kernel.org 1364L: linux-wireless@vger.kernel.org