You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds a57793651f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... * 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (51 commits) [IPV6]: Fix again the fl6_sock_lookup() fixed locking [NETFILTER]: nf_conntrack_tcp: fix connection reopening fix [IPV6]: Fix race in ipv6_flowlabel_opt() when inserting two labels [IPV6]: Lost locking in fl6_sock_lookup [IPV6]: Lost locking when inserting a flowlabel in ipv6_fl_list [NETFILTER]: xt_sctp: fix mistake to pass a pointer where array is required [NET]: Fix OOPS due to missing check in dev_parse_header(). [TCP]: Remove lost_retrans zero seqno special cases [NET]: fix carrier-on bug? [NET]: Fix uninitialised variable in ip_frag_reasm() [IPSEC]: Rename mode to outer_mode and add inner_mode [IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP [IPSEC]: Use the top IPv4 route's peer instead of the bottom [IPSEC]: Store afinfo pointer in xfrm_mode [IPSEC]: Add missing BEET checks [IPSEC]: Move type and mode map into xfrm_state.c [IPSEC]: Fix length check in xfrm_parse_spi [IPSEC]: Move ip_summed zapping out of xfrm6_rcv_spi [IPSEC]: Get nexthdr from caller in xfrm6_rcv_spi [IPSEC]: Move tunnel parsing for IPv4 out of xfrm4_input ...		17 years ago
..
netfilter	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	17 years ago
Kconfig	…
Makefile	…
addrconf.c	[IPV6]: Cleanup snmp6_alloc_dev()	17 years ago
addrconf_core.c	…
af_inet6.c	[IPV6]: Fix memory leak in cleanup_ipv6_mibs()	17 years ago
ah6.c	[IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP	17 years ago
anycast.c	…
datagram.c	…
esp6.c	[IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP	17 years ago
exthdrs.c	…
exthdrs_core.c	…
fib6_rules.c	…
icmp.c	…
inet6_connection_sock.c	…
inet6_hashtables.c	…
ip6_fib.c	…
ip6_flowlabel.c	[IPV6]: Fix again the fl6_sock_lookup() fixed locking	17 years ago
ip6_input.c	…
ip6_output.c	…
ip6_tunnel.c	…
ipcomp6.c	[IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP	17 years ago
ipv6_sockglue.c	…
mcast.c	…
mip6.c	…
ndisc.c	sysctl: fix neighbour table sysctls.	17 years ago
netfilter.c	…
proc.c	…
protocol.c	…
raw.c	…
reassembly.c	[INET]: Consolidate frag queues freeing	17 years ago
route.c	sysctl: ipv6 route flushing (kill binary path)	17 years ago
sit.c	…
sysctl_net_ipv6.c	…
tcp_ipv6.c	…
tunnel6.c	…
udp.c	…
udp_impl.h	…
udplite.c	…
xfrm6_input.c	[IPSEC]: Rename mode to outer_mode and add inner_mode	17 years ago
xfrm6_mode_beet.c	[IPSEC]: Add missing BEET checks	17 years ago
xfrm6_mode_ro.c	[IPSEC]: Disallow combinations of RO and AH/ESP/IPCOMP	17 years ago
xfrm6_mode_transport.c	…
xfrm6_mode_tunnel.c	[IPSEC]: Add missing BEET checks	17 years ago
xfrm6_output.c	[IPSEC]: Rename mode to outer_mode and add inner_mode	17 years ago
xfrm6_policy.c	[IPSEC]: Rename mode to outer_mode and add inner_mode	17 years ago
xfrm6_state.c	[IPSEC]: Store afinfo pointer in xfrm_mode	17 years ago
xfrm6_tunnel.c	[IPSEC]: Get nexthdr from caller in xfrm6_rcv_spi	17 years ago