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:
  [IPV4] SNMP: Display new statistics at /proc/net/netstat
  [IPV6]: Reverse sense of promisc tests in ip6_mc_input
  [NET_SCHED]: prio qdisc boundary condition
  [IPSEC]: Don't warn if high-order hash resize fails
  [IPSEC]: Check validity of direction in xfrm_policy_byid

...

This commit is contained in:

Linus Torvalds 2007-05-14 12:28:11 -07:00

parent 29e0937bb6 d831666e98

commit 200cfbb36c

5 changed files with 29 additions and 3 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

21

net/ipv4/proc.c

View file

2

net/ipv6/ip6_input.c

View file

2

net/sched/sch_prio.c

View file

3

net/xfrm/xfrm_hash.c

View file

4

net/xfrm/xfrm_policy.c

View file