summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-04-021-1/+1
|\
| * net/netfilter/nfnetlink_acct.c: use linux/atomic.hAndrew Morton2012-04-011-1/+1
* | Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub...Linus Torvalds2012-03-283-3/+0
|\ \ | |/ |/|
| * Remove all #inclusions of asm/system.hDavid Howells2012-03-283-3/+0
* | netfilter: nf_conntrack: permanently attach timeout policy to conntrackPablo Neira Ayuso2012-03-231-17/+22
* | netfilter: xt_CT: fix assignation of the generic protocol trackerPablo Neira Ayuso2012-03-231-1/+8
* | netfilter: xt_CT: missing rcu_read_lock section in timeout assignmentPablo Neira Ayuso2012-03-231-6/+12
* | netfilter: cttimeout: fix dependency with l4protocol conntrack modulePablo Neira Ayuso2012-03-233-24/+48
* | netfilter: xt_LOG: use CONFIG_IP6_NF_IPTABLES instead of CONFIG_IPV6Pablo Neira Ayuso2012-03-221-6/+6
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-03-2031-295/+2996
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-181-11/+12
| |\
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-092-5/+6
| |\ \
| * | | netfilter: xt_CT: allow to attach timeout policy + glue codePablo Neira Ayuso2012-03-073-16/+256
| * | | netfilter: nf_ct_ext: add timeout extensionPablo Neira Ayuso2012-03-075-10/+78
| * | | netfilter: add cttimeout infrastructure for fine timeout tuningPablo Neira Ayuso2012-03-0710-0/+909
| * | | netfilter: nf_conntrack: pass timeout array to l4->new and l4->packetPablo Neira Ayuso2012-03-078-44/+102
| * | | netfilter: nf_ct_gre: add unsigned int array to define timeoutsPablo Neira Ayuso2012-03-071-4/+12
| * | | netfilter: nf_ct_tcp: move retransmission and unacknowledged timeout to arrayPablo Neira Ayuso2012-03-071-14/+13
| * | | netfilter: nf_ct_udp[lite]: convert UDP[lite] timeouts to arrayPablo Neira Ayuso2012-03-072-18/+37
| * | | netfilter: ctnetlink: fix lockep splatsHans Schillstrom2012-03-071-16/+24
| * | | netfilter: xt_LOG: fix bogus extra layer-4 logging informationRichard Weinberger2012-03-071-0/+4
| * | | netfilter: nf_ct_ecache: refactor nf_ct_deliver_cached_eventsTony Zelenoff2012-03-071-26/+29
| * | | netfilter: nf_ct_ecache: trailing whitespace removedTony Zelenoff2012-03-071-1/+1
| * | | netfilter: merge ipt_LOG and ip6_LOG into xt_LOGRichard Weinberger2012-03-073-0/+931
| * | | netfilter: ctnetlink: allow to set expectfn for expectationsPablo Neira Ayuso2012-03-072-1/+72
| * | | netfilter: ctnetlink: add NAT support for expectationsPablo Neira Ayuso2012-03-071-2/+66
| * | | netfilter: ctnetlink: allow to set expectation classPablo Neira Ayuso2012-03-071-1/+11
| * | | netfilter: ctnetlink: allow to set helper for new expectationsPablo Neira Ayuso2012-03-071-1/+29
| * | | netfilter: ipset: Exceptions support added to hash:*net* typesJozsef Kadlecsik2012-03-074-93/+329
| * | | netfilter: ipset: use NFPROTO_ constantsJan Engelhardt2012-03-0713-60/+60
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-02-265-45/+86
| |\ \ \
| * | | | netfilter: ctnetlink: support kernel-space dump filtering by ctmarkPablo Neira Ayuso2012-02-261-1/+34
| * | | | netlink: add netlink_dump_control structure for netlink_dump_start()Pablo Neira Ayuso2012-02-263-11/+23
* | | | | Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2012-03-201-3/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-03-122-5/+6
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'perf/urgent' into perf/coreIngo Molnar2012-03-055-45/+86
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | static keys: Introduce 'struct static_key', static_key_true()/false() and sta...Ingo Molnar2012-02-241-3/+3
| | |_|/ | |/| |
* | | | netfilter: ctnetlink: fix race between delete and timeout expirationPablo Neira Ayuso2012-03-171-11/+12
| |_|/ |/| |
* | | netfilter: nf_conntrack: fix early_drop with reliable event deliveryPablo Neira Ayuso2012-03-061-2/+6
* | | netfilter: ctnetlink: remove incorrect spin_[un]lock_bh on NAT module autoloadPablo Neira Ayuso2012-03-061-3/+0
| |/ |/|
* | netfilter: ctnetlink: fix soft lockup when netlink adds new entries (v2)Jozsef Kadlecsik2012-02-242-34/+50
* | Revert "netfilter: ctnetlink: fix soft lockup when netlink adds new entries"Pablo Neira Ayuso2012-02-241-16/+27
* | Merge branch 'nf' of git://1984.lsi.us.es/netDavid S. Miller2012-02-233-36/+49
|\ \
| * | netfilter: ctnetlink: fix soft lockup when netlink adds new entriesJozsef Kadlecsik2012-02-211-27/+16
| * | netfilter: nf_queue: fix queueing of bridged gro skbsFlorian Westphal2012-02-091-8/+32
| * | ipvs: fix matching of fwmark templates during schedulingSimon Horman2012-02-041-1/+1
| |/
* | netfilter: ip6_route_output() never returns NULL.RongQing.Li2012-02-221-2/+3
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-01-175-32/+34
|\
| * netfilter: ipset: dumping error triggered removing references twiceJozsef Kadlecsik2012-01-171-0/+1
| * netfilter: ipset: autoload set type modules safelyJozsef Kadlecsik2012-01-171-10/+26
OpenPOWER on IntegriCloud