[GIT]: Networking
David Miller
1) Wireless fixes from Linville and co. in particular an
iwlwifi tfd freeing issue that many people are likely to hit.
2) GRO handling uses napi->dev when it should use skb->dev,
breaking VLAN + GRO. Fix from Ajit Khaparde.
3) Make IPV6 max_addresses sysctl documentation clearer.
4) Add new device ID to cdc_ether, from Torgny Johansson.
5) tc35815 double netif_wake_queue()s, triggering a BUG().
Fix from Atsushi Nemoto.
6) DMA mapping error handlng on RX in e1000 driver crashes under
load. Fix from Anton Blanchard.
7) MAINTAINERS update for mv643xx_eth.
Please pull, thanks a lot!
The following changes since commit be64c970f601d5bb439b6cc88ea2bd208b3422a0:
Linus Torvalds (1):
Merge branch 'release' of git://git.kernel.org/.../lenb/linux-acpi-2.6
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master
Ajit Khaparde (1):
net: bug fix for vlan + gro issue
Anton Blanchard (1):
e1000: Fix DMA mapping error handling on RX
Atsushi Nemoto (1):
tc35815: Remove a wrong netif_wake_queue() call which triggers BUG_ON
Brian Haley (1):
IPv6: better document max_addresses parameter
Dan Halperin (1):
iwlwifi: set HT flags after channel in rxon
David S. Miller (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
Lennert Buytenhek (1):
MAINTAINERS: update mv643xx_eth maintenance status
Stanislaw Gruszka (1):
iwlwifi: sanity check before counting number of tfds can be free
Torgny Johansson (1):
cdc_ether: new PID for Ericsson C3607w to the whitelist (resubmit)
Wey-Yi Guy (1):
iwlwifi: error checking for number of tfds in queue
Documentation/networking/ip-sysctl.txt | 8 ++++----
MAINTAINERS | 4 ++--
drivers/net/e1000/e1000_main.c | 19 ++++++++++++++++++-
drivers/net/tc35815.c | 1 -
drivers/net/usb/cdc_ether.c | 5 +++++
drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-5000.c | 8 +++-----
drivers/net/wireless/iwlwifi/iwl-core.c | 2 +-
drivers/net/wireless/iwlwifi/iwl-core.h | 2 ++
drivers/net/wireless/iwlwifi/iwl-tx.c | 22 ++++++++++++++++++++--
net/core/dev.c | 2 +-
11 files changed, 57 insertions(+), 18 deletions(-)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
David Miller
Date: Sun, 28 Feb 2010 23:05:35 -0800 (PST)
> Please pull, thanks a lot!
>
> The following changes since commit 30ff056c42c665b9ea535d8515890857ae382540:
> Linus Torvalds (1):
> Merge branch 'x86-uv-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
>
> are available in the git repository at:
>
> master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6.git master
Linus, if you haven't pulled in the networking tree yet, please pull
again as I just pushed the following bug fixes into there tonight.
Thanks!
The following changes since commit 47871889c601d8199c51a4086f77eebd77c29b0b:
David S. Miller (1):
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-next-2.6.git master
Eric Dumazet (1):
net: fix protocol sk_buff field
Herton Ronaldo Krzesinski (1):
sis190: fix cable detect via link status poll
Jiri Pirko (1):
virtio_net: remove forgotten assignment
Sathya Perla (1):
be2net: fix tx completion polling
Sridhar Samudrala (1):
bridge: Fix build error when IGMP_SNOOPING is not enabled
drivers/net/benet/be_cmds.c | 26 +++++++++++-----------
drivers/net/benet/be_cmds.h | 2 +-
drivers/net/benet/be_main.c | 47 +++++++++++++++++++++----------------------
drivers/net/sis190.c | 23 ++++++++++++++++----
drivers/net/virtio_net.c | 1 -
include/linux/skbuff.h | 2 +-
net/bridge/br_private.h | 14 ++++++++----
7 files changed, 65 insertions(+), 50 deletions(-)