David S. Miller c32f38619a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Merge the 'net' tree to get the recent set of netfilter bug fixes in
order to assist with some merge hassles Pablo is going to have to deal
with for upcoming changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-08-31 15:14:18 -04:00

..

arp_tables.c

net: Convert net_ratelimit uses to net_<level>_ratelimited

2012-05-15 13:45:03 -04:00

arpt_mangle.c

…

arptable_filter.c

…

ip_tables.c

net: Convert net_ratelimit uses to net_<level>_ratelimited

2012-05-15 13:45:03 -04:00

ipt_ah.c

…

ipt_CLUSTERIP.c

net: Convert net_ratelimit uses to net_<level>_ratelimited

2012-05-15 13:45:03 -04:00

ipt_ECN.c

…

ipt_MASQUERADE.c

ipv4: Adjust semantics of rt->rt_gateway.

2012-07-20 13:31:20 -07:00

ipt_NETMAP.c

netfilter: nf_nat: export NAT definitions to userspace

2011-12-23 14:36:43 +01:00

ipt_REDIRECT.c

netfilter: nf_nat: export NAT definitions to userspace

2011-12-23 14:36:43 +01:00

ipt_REJECT.c

netfilter: Fix ip_route_me_harder triggering ip_rt_bug

2011-06-29 05:47:32 -07:00

ipt_rpfilter.c

net: Loopback ifindex is constant now

2012-08-09 16:18:07 -07:00

ipt_ULOG.c

netlink: add netlink_kernel_cfg parameter to netlink_kernel_create

2012-06-29 16:46:02 -07:00

iptable_filter.c

netfilter: remove unnecessary goto statement for error recovery

2012-08-22 19:17:38 +02:00

iptable_mangle.c

netfilter: remove unnecessary goto statement for error recovery

2012-08-22 19:17:38 +02:00

iptable_raw.c

netfilter: remove unnecessary goto statement for error recovery

2012-08-22 19:17:38 +02:00

iptable_security.c

netfilter: PTR_RET can be used

2012-08-14 02:31:47 +02:00

Kconfig

netfilter: merge ipt_LOG and ip6_LOG into xt_LOG

2012-03-07 17:40:49 +01:00

Makefile

netfilter: remove ip_queue support

2012-05-08 20:25:42 +02:00

nf_conntrack_l3proto_ipv4_compat.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

nf_conntrack_l3proto_ipv4.c

netfilter: add user-space connection tracking helper infrastructure

2012-06-16 15:40:02 +02:00

nf_conntrack_proto_icmp.c

netfilter: nf_conntrack: generalize nf_ct_l4proto_net

2012-07-04 19:37:22 +02:00

nf_defrag_ipv4.c

netfilter: ipv4, defrag: switch hook PFs to nfproto

2012-06-07 14:58:42 +02:00

nf_nat_amanda.c

netfilter: nf_ct_helper: implement variable length helper private data

2012-06-16 15:08:55 +02:00

nf_nat_core.c

netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y

2012-06-22 02:49:52 +02:00

nf_nat_ftp.c

rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER

2011-08-02 04:29:23 -07:00

nf_nat_h323.c

netfilter: nf_ct_helper: implement variable length helper private data

2012-06-16 15:08:55 +02:00

nf_nat_helper.c

netfilter: nfnetlink_queue: add NAT TCP sequence adjustment if packet mangled

2012-06-16 15:09:08 +02:00

nf_nat_irc.c

rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER

2011-08-02 04:29:23 -07:00

nf_nat_pptp.c

netfilter: nf_ct_helper: implement variable length helper private data

2012-06-16 15:08:55 +02:00

nf_nat_proto_common.c

netfilter: ctnetlink: remove dead NAT code

2011-12-23 14:36:46 +01:00

nf_nat_proto_dccp.c

netfilter: ctnetlink: remove dead NAT code

2011-12-23 14:36:46 +01:00

nf_nat_proto_gre.c

netfilter: ctnetlink: remove dead NAT code

2011-12-23 14:36:46 +01:00

nf_nat_proto_icmp.c

netfilter: ctnetlink: remove dead NAT code

2011-12-23 14:36:46 +01:00

nf_nat_proto_sctp.c

netfilter: ctnetlink: remove dead NAT code

2011-12-23 14:36:46 +01:00

nf_nat_proto_tcp.c

netfilter: ctnetlink: remove dead NAT code

2011-12-23 14:36:46 +01:00

nf_nat_proto_udp.c

netfilter: ctnetlink: remove dead NAT code

2011-12-23 14:36:46 +01:00

nf_nat_proto_udplite.c

netfilter: ctnetlink: remove dead NAT code

2011-12-23 14:36:46 +01:00

nf_nat_proto_unknown.c

netfilter: nat: remove module reference counting from NAT protocols

2011-12-23 14:36:45 +01:00

nf_nat_rule.c

netfilter: nf_nat: export NAT definitions to userspace

2011-12-23 14:36:43 +01:00

nf_nat_sip.c

netfilter: nf_nat_sip: fix incorrect handling of EBUSY for RTCP expectation

2012-08-30 18:27:14 +02:00

nf_nat_snmp_basic.c

net: Remove casts to same type

2012-06-04 11:45:11 -04:00

nf_nat_standalone.c

netfilter: nf_nat: export NAT definitions to userspace

2011-12-23 14:36:43 +01:00

nf_nat_tftp.c

netfilter: nf_ct_helper: implement variable length helper private data

2012-06-16 15:08:55 +02:00