David S. Miller 31111c26d9 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 ...

Conflicts:
	Documentation/feature-removal-schedule.txt

2011-03-15 13:03:27 -07:00

..

netfilter

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

2011-03-15 13:03:27 -07:00

addrconf_core.c

…

addrconf.c

ipv6: hash is calculated but not used afterwards

2011-02-25 14:00:22 -08:00

addrlabel.c

…

af_inet6.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

ah6.c

xfrm: Use separate low and high order bits of the sequence numbers in xfrm_skb_cb

2011-03-13 20:22:28 -07:00

anycast.c

…

datagram.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

esp6.c

esp6: Add support for IPsec extended sequence numbers

2011-03-13 20:22:29 -07:00

exthdrs_core.c

…

exthdrs.c

ipv6: Convert to use flowi6 where applicable.

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

fib6_rules.c

ipv6: Convert to use flowi6 where applicable.

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

icmp.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

inet6_connection_sock.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

inet6_hashtables.c

…

ip6_fib.c

ipv6: Convert to use flowi6 where applicable.

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

ip6_flowlabel.c

ipv6: Convert to use flowi6 where applicable.

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

ip6_input.c

…

ip6_output.c

ipv6: Convert to use flowi6 where applicable.

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

ip6_tunnel.c

ipv6: Convert to use flowi6 where applicable.

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

ip6mr.c

ipv6: Convert to use flowi6 where applicable.

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

ipcomp6.c

…

ipv6_sockglue.c

ipv6: Convert to use flowi6 where applicable.

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

Kconfig

…

Makefile

…

mcast.c

ipv6: Convert to use flowi6 where applicable.

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

mip6.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

ndisc.c

ipv6: Convert to use flowi6 where applicable.

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

netfilter.c

ipv6: Convert to use flowi6 where applicable.

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

proc.c

ipv6/udp: report SndbufErrors and RcvbufErrors

2010-10-30 16:17:23 -07:00

protocol.c

…

raw.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

reassembly.c

ipv6: Prepare the tree for un-inlined jhash.

2010-11-28 11:26:21 -08:00

route.c

ipv6: Convert to use flowi6 where applicable.

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

sit.c

ipv4: Create and use route lookup helpers.

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

syncookies.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

sysctl_net_ipv6.c

net: Fix ipv6 neighbour unregister_sysctl_table warning

2011-01-31 20:54:17 -08:00

tcp_ipv6.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

tunnel6.c

…

udp_impl.h

…

udp.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

udplite.c

net: fix nulls list corruptions in sk_prot_alloc

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

xfrm6_input.c

…

xfrm6_mode_beet.c

…

xfrm6_mode_ro.c

…

xfrm6_mode_transport.c

…

xfrm6_mode_tunnel.c

ipv6: Use ip6_dst_hoplimit() instead of direct dst_metric() calls.

2010-12-12 21:14:46 -08:00

xfrm6_output.c

ipv6: Fragment locally generated tunnel-mode IPSec6 packets as needed.

2010-12-19 20:22:23 -08:00

xfrm6_policy.c

net: Put fl6_* macros to struct flowi6 and use them again.

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

xfrm6_state.c

net: Use flowi4 and flowi6 in xfrm layer.

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

xfrm6_tunnel.c

…