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

Browse source

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [TG3]: Update driver version and reldate.
  [TG3]: Add 5755 nvram support
  [TG3]: Add 5755 support
  [IPV6]: ip6_xmit: remove unnecessary NULL ptr check
  [NET_SCHED]: cls_u32: remove unnecessary NULL-ptr check
  [IPV4]: Add fib rule netlink notifications
  [BNX2]: Update version and reldate
  [BNX2]: Separate tx producer and consumer fields
  [BNX2]: Move .h files to bnx2.c
  [BNX2]: Combine small mem allocations
  [BNX2]: Fix link change handling
  [PKTGEN]: Add MPLS extension.

...

This commit is contained in:

Linus Torvalds 2006-03-23 15:29:27 -08:00

parent debf798b1e 95381c893d

commit 554f593d6c

11 changed files with 371 additions and 111 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

20

Documentation/networking/pktgen.txt

View file

108

drivers/net/bnx2.c

View file

62

drivers/net/bnx2.h

View file

84

drivers/net/tg3.c

View file

9

drivers/net/tg3.h

View file

2

include/linux/pci_ids.h

View file

4

include/linux/rtnetlink.h

View file

158

net/core/pktgen.c

View file

27

net/ipv4/fib_rules.c

View file

2

net/ipv6/ip6_output.c

View file

6

net/sched/cls_u32.c

View file