Patrick McHardy 0134e89c7b Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6 ...

Conflicts:
	net/ipv4/route.c

Signed-off-by: Patrick McHardy <kaber@trash.net>

2011-01-14 14:12:37 +01:00

..

ipvs

IPVS: netns, final patch enabling network name space.

2011-01-13 10:30:29 +09:00

core.c

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

2011-01-13 10:29:21 +09:00

Kconfig

netfilter: fix Kconfig dependencies

2011-01-14 13:36:42 +01:00

Makefile

netfilter: add xt_cpu match

2010-07-23 12:59:36 +02:00

nf_conntrack_acct.c

netfilter: complete the deprecation of CONFIG_NF_CT_ACCT

2010-06-25 14:46:56 +02:00

nf_conntrack_amanda.c

…

nf_conntrack_core.c

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

2011-01-13 10:29:21 +09:00

nf_conntrack_ecache.c

net/netfilter: __rcu annotations

2010-08-19 17:18:01 -07:00

nf_conntrack_expect.c

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

2011-01-13 10:29:21 +09:00

nf_conntrack_extend.c

netfilter: rcu sparse cleanups

2010-11-15 19:45:13 +01:00

nf_conntrack_ftp.c

…

nf_conntrack_h323_asn1.c

…

nf_conntrack_h323_main.c

…

nf_conntrack_h323_types.c

…

nf_conntrack_helper.c

netfilter: rcu sparse cleanups

2010-11-15 19:45:13 +01:00

nf_conntrack_irc.c

…

nf_conntrack_l3proto_generic.c

…

nf_conntrack_netbios_ns.c

…

nf_conntrack_netlink.c

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

2011-01-13 10:29:21 +09:00

nf_conntrack_pptp.c

…

nf_conntrack_proto_dccp.c

netfilter: nf_conntrack: don't always initialize ct->proto

2010-11-12 17:33:17 +01:00

nf_conntrack_proto_generic.c

…

nf_conntrack_proto_gre.c

…

nf_conntrack_proto_sctp.c

netfilter: nf_conntrack: don't always initialize ct->proto

2010-11-12 17:33:17 +01:00

nf_conntrack_proto_tcp.c

netfilter: nf_conntrack: don't always initialize ct->proto

2010-11-12 17:33:17 +01:00

nf_conntrack_proto_udp.c

…

nf_conntrack_proto_udplite.c

…

nf_conntrack_proto.c

netfilter: rcu sparse cleanups

2010-11-15 19:45:13 +01:00

nf_conntrack_sane.c

…

nf_conntrack_sip.c

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

2010-10-21 08:21:34 -07:00

nf_conntrack_standalone.c

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

2011-01-13 10:29:21 +09:00

nf_conntrack_tftp.c

…

nf_internals.h

…

nf_log.c

netfilter: add __rcu annotations

2010-11-15 18:17:21 +01:00

nf_queue.c

netfilter: add __rcu annotations

2010-11-15 18:17:21 +01:00

nf_sockopt.c

…

nf_tproxy_core.c

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

2010-10-21 08:21:34 -07:00

nfnetlink_log.c

netfilter: add __rcu annotations

2010-11-15 18:17:21 +01:00

nfnetlink_queue.c

…

nfnetlink.c

…

x_tables.c

netfilter: x_table: speedup compat operations

2011-01-13 12:05:12 +01:00

xt_CHECKSUM.c

netfilter: add CHECKSUM target

2010-07-15 17:20:46 +02:00

xt_CLASSIFY.c

netfilter: xt_CLASSIFY: add ARP support, allow CLASSIFY target on any table

2010-11-15 13:57:56 +01:00

xt_cluster.c

…

xt_comment.c

…

xt_connbytes.c

netfilter: xt_connbytes: Force CT accounting to be enabled

2010-06-25 14:44:07 +02:00

xt_connlimit.c

…

xt_connmark.c

…

xt_CONNSECMARK.c

…

xt_conntrack.c

netfilter: xt_conntrack: support matching on port ranges

2011-01-13 12:05:12 +01:00

xt_cpu.c

netfilter: add xt_cpu match

2010-07-23 12:59:36 +02:00

xt_CT.c

secmark: make secmark object handling generic

2010-10-21 10:12:48 +11:00

xt_dccp.c

…

xt_dscp.c

…

xt_DSCP.c

…

xt_esp.c

…

xt_hashlimit.c

netfilter: xt_hashlimit: use proto_ports_offset() to support AH message

2010-08-19 17:16:25 -07:00

xt_helper.c

…

xt_hl.c

…

xt_HL.c

…

xt_IDLETIMER.c

netfilter: xt_IDLETIMER needs kdev_t.h

2010-06-22 08:13:31 +02:00

xt_iprange.c

…

xt_ipvs.c

IPVS: netns, use ip_vs_proto_data as param.

2011-01-13 10:30:27 +09:00

xt_LED.c

…

xt_length.c

…

xt_limit.c

…

xt_mac.c

…

xt_mark.c

…

xt_multiport.c

…

xt_NFLOG.c

…

xt_NFQUEUE.c

netfilter: xt_NFQUEUE: remove modulo operations

2010-11-12 17:34:17 +01:00

xt_NOTRACK.c

…

xt_osf.c

…

xt_owner.c

…

xt_physdev.c

…

xt_pkttype.c

…

xt_policy.c

…

xt_quota.c

xt_quota: report initial quota value instead of current value to userspace

2010-07-23 14:07:47 +02:00

xt_rateest.c

…

xt_RATEEST.c

…

xt_realm.c

…

xt_recent.c

llseek: automatically add .llseek fop

2010-10-15 15:53:27 +02:00

xt_repldata.h

…

xt_sctp.c

…

xt_SECMARK.c

secmark: make secmark object handling generic

2010-10-21 10:12:48 +11:00

xt_socket.c

netfilter: xt_socket: Make tproto signed in socket_mt6_v1().

2010-10-28 12:59:53 -07:00

xt_state.c

…

xt_statistic.c

…

xt_string.c

…

xt_tcpmss.c

…

xt_TCPMSS.c

…

xt_TCPOPTSTRIP.c

…

xt_tcpudp.c

…

xt_TEE.c

net: use the macros defined for the members of flowi

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

xt_time.c

…

xt_TPROXY.c

netfilter: fix module dependency issues with IPv6 defragmentation, ip6tables and xt_TPROXY

2010-10-25 13:58:36 -07:00

xt_TRACE.c

…

xt_u32.c

…