David S. Miller c5e1fd8cca Merge branch 'nf-next' of git://1984.lsi.us.es/net-next

2011-12-25 02:21:45 -05:00

..

ipv4

netfilter: nf_ct_icmp: keep the ICMP ct entries longer

2009-06-08 15:53:43 +02:00

ipv6

netfilter: fix compilation when conntrack is disabled but tproxy is enabled

2011-01-12 20:25:08 +01:00

nf_conntrack_acct.h

netfilter: nf_conntrack: use atomic64 for accounting counters

2011-12-18 01:19:19 +01:00

nf_conntrack_core.h

netfilter: nf_conntrack: IPS_UNTRACKED bit

2010-06-08 16:09:52 +02:00

nf_conntrack_ecache.h

netfilter: nf_conntrack: make event callback registration per-netns

2011-11-22 00:34:47 +01:00

nf_conntrack_expect.h

netfilter: rework user-space expectation helper support

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

nf_conntrack_extend.h

netfilter: nf_conntrack_tstamp: add flow-based timestamp extension

2011-01-19 16:00:07 +01:00

nf_conntrack_helper.h

netfilter: nf_conntrack: nf_conntrack snmp helper

2011-01-18 18:12:24 +01:00

nf_conntrack_l3proto.h

netfilter: add __rcu annotations

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

nf_conntrack_l4proto.h

netfilter: nf_conntrack: pass template to l4proto ->error() handler

2010-02-15 17:45:08 +01:00

nf_conntrack_timestamp.h

netfilter: nf_conntrack: fix linker error with NF_CONNTRACK_TIMESTAMP=n

2011-01-20 20:46:52 +01:00

nf_conntrack_tuple.h

netfilter: nf_nat: export NAT definitions to userspace

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

nf_conntrack_zones.h

netfilter: nf_defrag_ipv4: fix compilation error with NF_CONNTRACK=n

2010-02-18 19:04:44 +01:00

nf_conntrack.h

nf_conntrack.h: fix up fallout from implicit moduleparam.h presence

2011-10-31 19:32:33 -04:00

nf_log.h

treewide: use __printf not __attribute__((format(printf,...)))

2011-10-31 17:30:54 -07:00

nf_nat_core.h

netfilter: nf_nat: export NAT definitions to userspace

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

nf_nat_helper.h

netfilter: nf_nat: support mangling a single TCP packet multiple times

2010-02-11 12:27:09 +01:00

nf_nat_protocol.h

netfilter: ctnetlink: remove dead NAT code

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

nf_nat_rule.h

netfilter: nf_nat: support user-specified SNAT rules in LOCAL_IN

2010-06-17 06:12:26 +02:00

nf_nat.h

netfilter: nf_nat: export NAT definitions to userspace

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

nf_queue.h

netfilter: Use unsigned types for hooknum and pf vars

2008-10-08 11:35:00 +02:00

nf_tproxy_core.h

net: use IS_ENABLED(CONFIG_IPV6)

2011-12-11 18:25:16 -05:00

nfnetlink_log.h

nfnetlink_log: do not expose NFULNL_COPY_DISABLED to user-space

2010-07-15 11:27:41 +02:00

xt_log.h

netfilter: add missing xt_log.h file

2010-10-04 23:24:21 +02:00

xt_rateest.h

Merge branch 'master' of /repos/git/net-next-2.6

2010-06-15 17:31:06 +02:00