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:
  [DECNET]: Endianess fixes (try #2)
  [TG3]: Fix array overrun in tg3_read_partno().
  [NET]: Set truesize in pskb_copy
  [NETPOLL]: Compute checksum properly in netpoll_send_udp().
  [PKT_SCHED] sch_htb: Use hlist_del_init().
  [TCP]: Don't use highmem in tcp hash size calculation.
  [NET]: kconfig, correct traffic shaper

...

This commit is contained in:

Linus Torvalds 2006-11-08 07:34:11 -08:00

parent 80c2188127 375d9d7183

commit 3ee783a3e4

10 changed files with 47 additions and 36 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

8

drivers/net/Kconfig

View file

19

drivers/net/tg3.c

View file

6

net/core/netpoll.c

View file

1

net/core/skbuff.c

View file

23

net/decnet/af_decnet.c

View file

8

net/decnet/dn_nsp_in.c

View file

2

net/decnet/dn_nsp_out.c

View file

4

net/decnet/dn_rules.c

View file

4

net/ipv4/tcp.c

View file

6

net/sched/sch_htb.c

View file