diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-19 18:43:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-19 18:43:50 -0700 |
| commit | fbb5ba92766a0a7803635f053220c325d26def9c (patch) | |
| tree | 4cf6d9ed725b5d1254d4d29f5750c37676173490 /net/ipv4/tcp_hybla.c | |
| parent | 4fe1103201057e74f630b1cb8d8d49bd6ce0e666 (diff) | |
| parent | bc8a5397433e4effbaddfa7e462d10b3c060cabb (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
ipv4: make default for INET_LRO consistent with help text
net: fix skb_seq_read returning wrong offset/length for page frag data
pkt_sched: gen_estimator: use 64 bit intermediate counters for bps
be2net: add two new pci device ids to pci device table
sch_teql: should not dereference skb after ndo_start_xmit()
tcp: fix MSG_PEEK race check
Doc: fixed descriptions on /proc/sys/net/core/* and /proc/sys/net/unix/*
Neterion: *FIFO1_DMA_ERR set twice, should 2nd be *FIFO2_DMA_ERR?
mv643xx_eth: fix PPC DMA breakage
bonding: fix link down handling in 802.3ad mode
bridge: fix initial packet flood if !STP
bridge: relay bridge multicast pkgs if !STP
NET: Meth: Fix unsafe mix of irq and non-irq spinlocks.
mlx4_en: Fix not deleted napi structures
ipconfig: handle case of delayed DHCP server
netpoll: don't dereference NULL dev from np
wimax/i2400m: fix device crash: fix optimization in _roq_queue_update_ws
Diffstat (limited to 'net/ipv4/tcp_hybla.c')
0 files changed, 0 insertions, 0 deletions