黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop ...

Conflicts:
	drivers/i2c/busses/Kconfig
	drivers/net/dm9000.c
	drivers/net/wireless/libertas/if_sdio1.c
	drivers/usb/serial/option.c
	net/bluetooth/rfcomm/core.c

2010-12-16 20:54:24 +08:00

..

netfilter

netfilter: nf_conntrack: fix hash resizing with namespaces

2010-02-23 07:37:53 -08:00

af_inet.c

net: Replace AID_NET_RAW checks with capable(CAP_NET_RAW).

2010-02-08 15:35:52 -08:00

ah4.c

net: constify struct net_protocol

2009-09-14 17:03:01 -07:00

arp.c

net: make neigh_ops constant

2009-09-01 17:40:57 -07:00

cipso_ipv4.c

netlabel: Label incoming TCP connections correctly in SELinux

2009-03-28 15:01:36 +11:00

datagram.c

…

devinet.c

Merge remote branch 'linux-2.6.32.y/master' into develop

2010-12-16 20:54:24 +08:00

esp4.c

net: constify struct net_protocol

2009-09-14 17:03:01 -07:00

fib_frontend.c

net: restore ip source validation

2010-02-09 04:50:55 -08:00

fib_hash.c

ipv4: cleanup - remove two unused parameters from fib_semantic_match().

2009-05-18 15:16:37 -07:00

fib_lookup.h

ipv4: cleanup - remove two unused parameters from fib_semantic_match().

2009-05-18 15:16:37 -07:00

fib_rules.c

net: Remove unused parameter from fill method in fib_rules_ops.

2009-05-20 17:26:23 -07:00

fib_semantics.c

ipv4: cleanup - remove two unused parameters from fib_semantic_match().

2009-05-18 15:16:37 -07:00

fib_trie.c

fib_trie: resize rework

2009-08-28 23:57:15 -07:00

icmp.c

net: constify struct net_protocol

2009-09-14 17:03:01 -07:00

igmp.c

inet: Remove bogus IGMPv3 report handling

2010-03-15 08:49:39 -07:00

inet_connection_sock.c

tcp: reduce SYN-ACK retrans for TCP_DEFER_ACCEPT

2009-10-19 19:19:03 -07:00

inet_diag.c

net: correct off-by-one write allocations reports

2009-06-18 00:29:12 -07:00

inet_fragment.c

inet fragments: fix sparse warning: context imbalance

2009-02-26 23:13:35 -08:00

inet_hashtables.c

net: move bsockets outside of read only beginning of struct inet_hashinfo

2009-02-01 12:31:33 -08:00

inet_lro.c

include/net net/ - csum_partial - remove unnecessary casts

2008-11-19 15:44:53 -08:00

inet_timewait_sock.c

tcp: fix premature termination of FIN_WAIT2 time-wait sockets

2009-08-29 00:00:35 -07:00

inetpeer.c

…

ip_forward.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

ip_fragment.c

ipv4: additional update of dev_net(dev) to struct *net in ip_fragment.c, NULL ptr OOPS

2009-11-29 23:02:22 -08:00

ip_gre.c

gre: Fix dev_addr clobbering for gretap

2009-10-30 12:28:07 -07:00

ip_input.c

net: constify struct net_protocol

2009-09-14 17:03:01 -07:00

ip_options.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

ip_output.c

ip: fix truesize mismatch in ip fragmentation

2010-10-28 21:44:08 -07:00

ip_sockglue.c

net: Fix IP_MULTICAST_IF

2009-10-19 21:34:20 -07:00

ipcomp.c

net: constify struct net_protocol

2009-09-14 17:03:01 -07:00

ipconfig.c

ipv4: teach ipconfig about the MTU option in DHCP

2009-05-19 15:36:17 -07:00

ipip.c

ipip: Fix handling of DF packets when pmtudisc is OFF

2009-11-06 20:33:40 -08:00

ipmr.c

ipmr: missing dev_put() on error path in vif_add()

2009-11-13 19:56:54 -08:00

Kconfig

ipv4: update ARPD help text

2009-06-13 23:36:32 -07:00

Makefile

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

2010-02-08 15:07:44 -08:00

netfilter.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

proc.c

snmp: add missing counters for RFC 4293

2009-04-27 02:45:02 -07:00

protocol.c

net: constify struct net_protocol

2009-09-14 17:03:01 -07:00

raw.c

AF_RAW: Augment raw_send_hdrinc to expand skb to fit iphdr->ihl (v2)

2009-10-29 01:09:58 -07:00

route.c

net: blackhole route should always be recalculated

2010-10-28 21:44:10 -07:00

syncookies.c

percpu: clean up percpu variable definitions

2009-06-24 15:13:48 +09:00

sysctl_net_ipv4.c

sysctl: remove "struct file *" argument of ->proc_handler

2009-09-24 07:21:04 -07:00

sysfs_net_ipv4.c

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

2010-02-08 15:07:44 -08:00

tcp_bic.c

tcp: add helper for AI algorithm

2009-03-02 03:00:15 -08:00

tcp_cong.c

Networking: use CAP_NET_ADMIN when deciding to call request_module

2009-08-14 11:18:34 +10:00

tcp_cubic.c

tcp: add helper for AI algorithm

2009-03-02 03:00:15 -08:00

tcp_diag.c

net: inet_diag_handler structs can be const

2008-11-19 15:43:27 -08:00

tcp_highspeed.c

…

tcp_htcp.c

htcp: merge icsk_ca_state compare

2009-03-02 03:00:14 -08:00

tcp_hybla.c

…

tcp_illinois.c

…

tcp_input.c

tcp: Fix race in tcp_poll

2010-10-28 21:44:09 -07:00

tcp_ipv4.c

net: socket ioctl to reset connections matching local address

2010-02-08 15:07:36 -08:00

tcp_lp.c

…

tcp_minisocks.c

tcp: accept socket after TCP_DEFER_ACCEPT period

2009-10-19 19:19:01 -07:00

tcp_output.c

tcp: fix crash in tcp_xmit_retransmit_queue

2010-08-02 10:20:53 -07:00

tcp_probe.c

tcp: '< 0' test on unsigned

2009-03-13 16:05:14 -07:00

tcp_scalable.c

tcp: add helper for AI algorithm

2009-03-02 03:00:15 -08:00

tcp_timer.c

tcp: Combat per-cpu skew in orphan tests.

2010-09-26 17:21:17 -07:00

tcp_vegas.c

tcp: tcp_vegas ssthresh bugfix

2009-05-25 22:44:59 -07:00

tcp_vegas.h

…

tcp_veno.c

tcp: add helper for AI algorithm

2009-03-02 03:00:15 -08:00

tcp_westwood.c

…

tcp_yeah.c

tcp: add helper for AI algorithm

2009-03-02 03:00:15 -08:00

tcp.c

Limit sysctl_tcp_mem and sysctl_udp_mem initializers to prevent integer overflows.

2010-12-09 13:27:06 -08:00

tunnel4.c

net: constify struct net_protocol

2009-09-14 17:03:01 -07:00

udp_impl.h

net: Make setsockopt() optlen be unsigned.

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

udp.c

Limit sysctl_tcp_mem and sysctl_udp_mem initializers to prevent integer overflows.

2010-12-09 13:27:06 -08:00

udplite.c

net: constify struct net_protocol

2009-09-14 17:03:01 -07:00

xfrm4_input.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

xfrm4_mode_beet.c

…

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

xfrm4_output.c

net: skb->dst accessors

2009-06-03 02:51:04 -07:00

xfrm4_policy.c

xfrm4: strip ECN and IP Precedence bits in policy lookup

2010-10-28 21:44:06 -07:00

xfrm4_state.c

xfrm: remove useless forward declarations

2008-11-25 01:05:54 -08:00

xfrm4_tunnel.c

…