diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-17 11:44:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-17 11:44:51 -0400 |
commit | a018540141a931f5299a866907b27886916b4374 (patch) | |
tree | 63fd1f1a80bf2e89a7798ab4d9c026fa5f1866fd /MAINTAINERS | |
parent | 635ac11964dd1ab955dcd2f888d3ac6fd25419b4 (diff) | |
parent | 602e65a3b0c4f6b09fba19817ff798647a08e706 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller:
1) IPVS oops'ers:
a) Should not reset skb->nf_bridge in forwarding hook (Lin Ming)
b) 3.4 commit can cause ip_vs_control_cleanup to be invoked after
the ipvs_core_ops are unregistered during rmmod (Julian ANastasov)
2) ixgbevf bringup failure can crash in TX descriptor cleanup
(Alexander Duyck)
3) AX25 switch missing break statement hoses ROSE sockets (Alan Cox)
4) CAIF accesses freed per-net memory (Sjur Brandeland)
5) Network cgroup code has out-or-bounds accesses (Eric DUmazet), and
accesses freed memory (Gao Feng)
6) Fix a crash in SCTP reported by Dave Jones caused by freeing an
association still on a list (Neil HOrman)
7) __netdev_alloc_skb() regresses on GFP_DMA using drivers because that
GFP flag is not being retained for the allocation (Eric Dumazet).
8) Missing NULL hceck in sch_sfb netlink message parsing (Alan Cox)
9) bnx2 crashes because TX index iteration is not bounded correctly
(Michael Chan)
10) IPoIB generates warnings in TCP queue collapsing (via
skb_try_coalesce) because it does not set skb->truesize correctly
(Eric Dumazet)
11) vlan_info objects leak for the implicit vlan with ID 0 (Amir
Hanania)
12) A fix for TX time stamp handling in gianfar does not transfer socket
ownership from one packet to another correctly, resulting in a
socket write space imbalance (Eric Dumazet)
13) Julia Lawall found several cases where we do a list iteration, and
then at the loop termination unconditionally assume we ended up with
real list object, rather than the list head itself (CNIC, RXRPC,
mISDN).
14) The bonding driver handles procfs moving incorrectly when a device
it manages is moved from one namespace to another (Eric Biederman)
15) Missing memory barriers in stmmac descriptor accesses result in
various crashes (Deepak Sikri)
16) Fix handling of broadcast packets in batman-adv (Simon Wunderlich)
17) Properly check the sanity of sendmsg() lengths in ieee802154's
dgram_sendmsg(). Dave Jones and others have hit and reported this
bug (Sasha Levin)
18) Some drivers (b44 and b43legacy) on 64-bit machines stopped working
because of how netdev_alloc_skb() was adjusted. Such drivers should
now use alloc_skb() for obtaining bounce buffers. (Eric Dumazet)
19) atl1c mis-managed it's link state in that it stops the queue by hand
on link down. The generic networking takes care of that and this
double stop locks the queue down. So simply removing the driver's
queue stop call fixes the problem (Cloud Ren)
20) Fix out-of-memory due to mis-accounting in net_em packet scheduler
(Eric Dumazet)
21) If DCB and SR-IOV are configured at the same time in IXGBE the chip
will hang because this is not supported (Alexander Duyck)
22) A commit to stop drivers using netdev->base_addr broke the CNIC
driver (Michael Chan)
23) Timeout regression in ipset caused by an attempt to fix an overflow
bug (Jozsef Kadlecsik).
24) mac80211 minstrel code allocates memory using incorrect size
(Thomas Huehn)
25) llcp_sock_getname() needs to check for a NULL device otherwise we
OOPS (Sasha Levin)
26) mwifiex leaks memory (Bing Zhao)
27) Propagate iwlwifi fix to iwlegacy, even when we're not associated
we need to monitor for stuck queues in the watchdog handler
(Stanislaw Geuszka)
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (44 commits)
ipvs: fix oops in ip_vs_dst_event on rmmod
ipvs: fix oops on NAT reply in br_nf context
ixgbevf: Fix panic when loading driver
ax25: Fix missing break
MAINTAINERS: reflect actual changes in IEEE 802.15.4 maintainership
caif: Fix access to freed pernet memory
net: cgroup: fix access the unallocated memory in netprio cgroup
ixgbevf: Prevent RX/TX statistics getting reset to zero
sctp: Fix list corruption resulting from freeing an association on a list
net: respect GFP_DMA in __netdev_alloc_skb()
e1000e: fix test for PHY being accessible on 82577/8/9 and I217
e1000e: Correct link check logic for 82571 serdes
sch_sfb: Fix missing NULL check
bnx2: Fix bug in bnx2_free_tx_skbs().
IPoIB: fix skb truesize underestimatiom
net: Fix memory leak - vlan_info struct
gianfar: fix potential sk_wmem_alloc imbalance
drivers/net/ethernet/broadcom/cnic.c: remove invalid reference to list iterator variable
net/rxrpc/ar-peer.c: remove invalid reference to list iterator variable
drivers/isdn/mISDN/stack.c: remove invalid reference to list iterator variable
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1b71f6ceae0a..c82c343168e8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3433,13 +3433,14 @@ S: Supported | |||
3433 | F: drivers/idle/i7300_idle.c | 3433 | F: drivers/idle/i7300_idle.c |
3434 | 3434 | ||
3435 | IEEE 802.15.4 SUBSYSTEM | 3435 | IEEE 802.15.4 SUBSYSTEM |
3436 | M: Alexander Smirnov <alex.bluesman.smirnov@gmail.com> | ||
3436 | M: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 3437 | M: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> |
3437 | M: Sergey Lapin <slapin@ossfans.org> | ||
3438 | L: linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers) | 3438 | L: linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers) |
3439 | W: http://apps.sourceforge.net/trac/linux-zigbee | 3439 | W: http://apps.sourceforge.net/trac/linux-zigbee |
3440 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git | 3440 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git |
3441 | S: Maintained | 3441 | S: Maintained |
3442 | F: net/ieee802154/ | 3442 | F: net/ieee802154/ |
3443 | F: net/mac802154/ | ||
3443 | F: drivers/ieee802154/ | 3444 | F: drivers/ieee802154/ |
3444 | 3445 | ||
3445 | IIO SUBSYSTEM AND DRIVERS | 3446 | IIO SUBSYSTEM AND DRIVERS |