aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAge
* Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-28
|\
| * Remove all #inclusions of asm/system.hDavid Howells2012-03-28
* | netfilter: nf_conntrack: permanently attach timeout policy to conntrackPablo Neira Ayuso2012-03-22
* | netfilter: xt_CT: fix assignation of the generic protocol trackerPablo Neira Ayuso2012-03-22
* | netfilter: xt_CT: missing rcu_read_lock section in timeout assignmentPablo Neira Ayuso2012-03-22
* | netfilter: cttimeout: fix dependency with l4protocol conntrack modulePablo Neira Ayuso2012-03-22
* | netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6Pablo Neira Ayuso2012-03-22
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-03-21
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-18
| |\
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-09
| |\ \
| * | | netfilter: xt_CT: allow to attach timeout policy + glue codePablo Neira Ayuso2012-03-07
| * | | netfilter: nf_ct_ext: add timeout extensionPablo Neira Ayuso2012-03-07
| * | | netfilter: add cttimeout infrastructure for fine timeout tuningPablo Neira Ayuso2012-03-07
| * | | netfilter: nf_conntrack: pass timeout array to l4->new and l4->packetPablo Neira Ayuso2012-03-07
| * | | netfilter: nf_ct_gre: add unsigned int array to define timeoutsPablo Neira Ayuso2012-03-07
| * | | netfilter: nf_ct_tcp: move retransmission and unacknowledged timeout to arrayPablo Neira Ayuso2012-03-07
| * | | netfilter: nf_ct_udp[lite]: convert UDP[lite] timeouts to arrayPablo Neira Ayuso2012-03-07
| * | | netfilter: ctnetlink: fix lockep splatsHans Schillstrom2012-03-07
| * | | netfilter: xt_LOG: fix bogus extra layer-4 logging informationRichard Weinberger2012-03-07
| * | | netfilter: nf_ct_ecache: refactor nf_ct_deliver_cached_eventsTony Zelenoff2012-03-07
| * | | netfilter: nf_ct_ecache: trailing whitespace removedTony Zelenoff2012-03-07
| * | | netfilter: merge ipt_LOG and ip6_LOG into xt_LOGRichard Weinberger2012-03-07
| * | | netfilter: ctnetlink: allow to set expectfn for expectationsPablo Neira Ayuso2012-03-07
| * | | netfilter: ctnetlink: add NAT support for expectationsPablo Neira Ayuso2012-03-07
| * | | netfilter: ctnetlink: allow to set expectation classPablo Neira Ayuso2012-03-07
| * | | netfilter: ctnetlink: allow to set helper for new expectationsPablo Neira Ayuso2012-03-07
| * | | netfilter: ipset: Exceptions support added to hash:*net* typesJozsef Kadlecsik2012-03-07
| * | | netfilter: ipset: use NFPROTO_ constantsJan Engelhardt2012-03-07
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-02-26
| |\ \ \
| * | | | netfilter: ctnetlink: support kernel-space dump filtering by ctmarkPablo Neira Ayuso2012-02-26
| * | | | netlink: add netlink_dump_control structure for netlink_dump_start()Pablo Neira Ayuso2012-02-26
* | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2012-03-20
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-03-12
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-03-05
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | static keys: Introduce 'struct static_key', static_key_true()/false() and sta...Ingo Molnar2012-02-24
| | |_|/ | |/| |
* | | | netfilter: ctnetlink: fix race between delete and timeout expirationPablo Neira Ayuso2012-03-17
| |_|/ |/| |
* | | netfilter: nf_conntrack: fix early_drop with reliable event deliveryPablo Neira Ayuso2012-03-06
* | | netfilter: ctnetlink: remove incorrect spin_[un]lock_bh on NAT module autoloadPablo Neira Ayuso2012-03-06
| |/ |/|
* | netfilter: ctnetlink: fix soft lockup when netlink adds new entries (v2)Jozsef Kadlecsik2012-02-24
* | Revert "netfilter: ctnetlink: fix soft lockup when netlink adds new entries"Pablo Neira Ayuso2012-02-24
* | Merge branch 'nf' of git://1984.lsi.us.es/netDavid S. Miller2012-02-23
|\ \
| * | netfilter: ctnetlink: fix soft lockup when netlink adds new entriesJozsef Kadlecsik2012-02-21
| * | netfilter: nf_queue: fix queueing of bridged gro skbsFlorian Westphal2012-02-09
| * | ipvs: fix matching of fwmark templates during schedulingSimon Horman2012-02-04
| |/
* / netfilter: ip6_route_output() never returns NULL.RongQing.Li2012-02-22
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-01-18
|\
| * netfilter: ipset: dumping error triggered removing references twiceJozsef Kadlecsik2012-01-17
| * netfilter: ipset: autoload set type modules safelyJozsef Kadlecsik2012-01-17
| * netfilter: revert user-space expectation helper supportPablo Neira Ayuso2012-01-16
| * netfilter: xt_hashlimit: fix unused variable warning if IPv6 disabledStephen Rothwell2012-01-16