黄涛 67450b3bb6 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0 ...

Merge v3.0.59
Conflicts:
	Makefile
	drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
	drivers/usb/serial/option.c

2013-01-21 17:21:19 +08:00

..

netfilter

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-12-01 12:07:55 +08:00

af_inet.c

Merge commit 'v3.0-rc7' into android-3.0

2011-07-12 20:10:37 -07:00

ah4.c

ah: Don't return NET_XMIT_DROP on input.

2012-02-03 09:18:54 -08:00

arp.c

net: Don't proxy arp respond if iif == rt->dst.dev if private VLAN is disabled

2012-02-29 16:34:06 -08:00

cipso_ipv4.c

cipso: don't follow a NULL pointer when setsockopt() is called

2012-08-09 08:27:52 -07:00

datagram.c

ipv4: Lock socket and use cork flow in ip4_datagram_connect().

2011-05-08 13:48:57 -07:00

devinet.c

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2013-01-21 17:21:19 +08:00

esp4.c

xfrm: take net hdr len into account for esp payload size calculation

2012-06-10 00:33:03 +09:00

fib_frontend.c

rtnetlink: Compute and store minimum ifinfo dump size

2013-01-17 08:43:58 -08:00

fib_lookup.h

ipv4: Fix nexthop caching wrt. scoping.

2011-03-24 18:06:47 -07:00

fib_rules.c

ipv4: Use flowi4 in FIB layer.

2011-03-12 15:08:49 -08:00

fib_semantics.c

ipv4: Skip calling fib_detect_death() if fib_dev is NULL

2012-12-03 14:14:27 +08:00

fib_trie.c

ipv4: Do not use dead fib_info entries.

2012-06-10 00:33:02 +09:00

gre.c

gre: fix improper error handling

2011-08-15 18:31:39 -07:00

icmp.c

icmp: Fix regression in nexthop resolution during replies.

2011-08-15 18:31:37 -07:00

igmp.c

igmp: Avoid zero delay when receiving odd mixture of IGMP queries

2012-01-12 11:35:41 -08:00

inet_connection_sock.c

seqlock: Get rid of SEQLOCK_UNLOCKED

2011-05-24 15:22:17 +02:00

inet_diag.c

rtnetlink: Compute and store minimum ifinfo dump size

2013-01-17 08:43:58 -08:00

inet_fragment.c

net/ipv4: EXPORT_SYMBOL cleanups

2010-07-12 12:57:54 -07:00

inet_hashtables.c

net: Compute protocol sequence numbers and fragment IDs using MD5.

2011-08-15 18:31:35 -07:00

inet_lro.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

inet_timewait_sock.c

tcp: fix inet_twsk_deschedule()

2011-02-19 18:59:04 -08:00

inetpeer.c

net: Compute protocol sequence numbers and fragment IDs using MD5.

2011-08-15 18:31:35 -07:00

ip_forward.c

ipv4: Save nexthop address of LSRR/SSRR option to IPCB.

2012-02-29 16:34:02 -08:00

ip_fragment.c

ipv4: Don't use enums as bitmasks in ip_fragment.c

2011-05-17 17:28:02 -04:00

ip_gre.c

net: fix NULL dereferences in check_peer_redir()

2012-02-13 11:06:13 -08:00

ip_input.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ip_options.c

ipv4: Fix wrong order of ip_rt_get_source() and update iph->daddr.

2012-02-29 16:34:03 -08:00

ip_output.c

net: fix NULL dereferences in check_peer_redir()

2012-02-13 11:06:13 -08:00

ip_sockglue.c

ipv4: avoid undefined behavior in do_ip_setsockopt()

2012-11-26 11:34:35 -08:00

ipcomp.c

inet: constify ip headers and in6_addr

2011-04-22 11:04:14 -07:00

ipconfig.c

net: have ipconfig not wait if no dev is available

2012-01-06 14:14:08 -08:00

ipip.c

ipip, sit: copy parms.name after register_netdevice

2012-01-06 14:13:45 -08:00

ipmr.c

rtnetlink: Compute and store minimum ifinfo dump size

2013-01-17 08:43:58 -08:00

Kconfig

ipv4: Remove fib_hash.

2011-02-01 15:35:25 -08:00

Makefile

sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size

2011-06-14 09:08:47 -07:00

netfilter.c

netfilter: TCP and raw fix for ip_route_me_harder

2011-10-03 11:40:53 -07:00

ping.c

ipv4, ping: Remove duplicate icmp.h include

2011-06-20 13:04:38 -07:00

proc.c

tcp: implement RFC 5961 4.2

2013-01-11 09:03:48 -08:00

protocol.c

net: add __rcu annotations to protocol

2010-10-27 11:37:31 -07:00

raw.c

ipv4: raw: fix icmp_filter()

2012-10-13 05:28:07 +09:00

route.c

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2013-01-21 17:21:19 +08:00

syncookies.c

tcp: fix syncookie regression

2012-03-23 11:20:51 -07:00

sysctl_net_ipv4.c

tcp: implement RFC 5961 3.2

2013-01-11 09:03:48 -08:00

sysfs_net_ipv4.c

sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size

2011-06-14 09:08:47 -07:00

tcp_bic.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_cong.c

tcp: Apply device TSO segment limit earlier

2012-10-02 09:47:04 -07:00

tcp_cubic.c

tcp_cubic: limit delayed_ack ratio to prevent divide error

2011-05-08 15:51:57 -07:00

tcp_diag.c

tcp: diag: Dont report negative values for rx queue

2009-12-03 16:06:13 -08:00

tcp_highspeed.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_htcp.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_hybla.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_illinois.c

net: fix divide by zero in tcp algorithm illinois

2012-11-17 13:14:24 -08:00

tcp_input.c

tcp: RFC 5961 5.2 Blind Data Injection Attack Mitigation

2013-01-11 09:03:48 -08:00

tcp_ipv4.c

tcp: resets are misrouted

2012-10-28 10:02:13 -07:00

tcp_lp.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

tcp_minisocks.c

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

2010-12-08 13:47:38 -08:00

tcp_output.c

tcp: Apply device TSO segment limit earlier

2012-10-02 09:47:04 -07:00

tcp_probe.c

net: ipv4: tcp_probe: cleanup snprintf() use

2010-11-17 12:27:46 -08:00

tcp_scalable.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_timer.c

tcp: Remove debug macro of TCP_CHECK_TIMER

2011-02-20 11:10:14 -08:00

tcp_vegas.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_vegas.h

[TCP]: congestion control API pass RTT in microseconds

2007-07-31 02:27:57 -07:00

tcp_veno.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_westwood.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_yeah.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

tcp.c

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0

2012-12-01 12:07:55 +08:00

tunnel4.c

tunnels: add __rcu annotations

2010-10-27 11:37:32 -07:00

udp_impl.h

net: Make setsockopt() optlen be unsigned.

2009-09-30 16:12:20 -07:00

udp.c

net: refine {udp|tcp|sctp}_mem limits

2011-07-07 00:27:05 -07:00

udplite.c

net: fix nulls list corruptions in sk_prot_alloc

2010-12-16 14:26:56 -08:00

xfrm4_input.c

net/ipv4: EXPORT_SYMBOL cleanups

2010-07-12 12:57:54 -07:00

xfrm4_mode_beet.c

ipsec: be careful of non existing mac headers

2012-03-19 08:57:45 -07:00

xfrm4_mode_transport.c

[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output

2007-10-10 16:55:54 -07:00

xfrm4_mode_tunnel.c

ipsec: be careful of non existing mac headers

2012-03-19 08:57:45 -07:00

xfrm4_output.c

xfrm4: Don't call icmp_send on local error

2011-07-01 17:33:19 -07:00

xfrm4_policy.c

ipv4: fix ipsec forward performance regression

2011-11-11 09:36:25 -08:00

xfrm4_state.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6

2011-05-11 14:26:58 -04:00

xfrm4_tunnel.c

net: struct xfrm_tunnel in read_mostly section

2010-08-30 13:50:45 -07:00