[GIT]: Networking

David Miller
2009-08-27T03:49:53Z

Two fixes:

1) Fix smc91x build on SMP, from Alexey Dobriyan

2) Handle out-of-memory situations more correctly when trying
to refill the RX ring buffers in virtio_net driver. From Rusty
Russell. Based upon user reports.

Please pull, thanks a lot!

The following changes since commit f415c413f458837bd0c27086b79aca889f9435e4:
Linus Torvalds (1):
Merge git://git.kernel.org/.../davem/net-2.6

are available in the git repository at:

master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master

Alexey Dobriyan (1):
smc91x: fix compilation on SMP

Rusty Russell (1):
virtio: net refill on out-of-memory

drivers/net/smc91x.c | 2 +-
drivers/net/virtio_net.c | 61 ++++++++++++++++++++++++++++++++++-----------
2 files changed, 47 insertions(+), 16 deletions(-)