summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-04-122-3/+3
|\
| * netfilter: nf_conntrack: fix incorrect logic in nf_conntrack_init_netGao feng2012-04-101-1/+1
| * netfilter: nf_ct_tcp: don't scale the size of the window up twiceChangli Gao2012-04-091-2/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-04-105-9/+23
|\ \ | |/
| * netfilter: nf_conntrack: fix count leak in error path of __nf_conntrack_allocPablo Neira Ayuso2012-04-031-0/+1
| * netfilter: xt_CT: fix missing put timeout object in error pathPablo Neira Ayuso2012-04-031-5/+19
| * netfilter: xt_CT: allocation has to be GFP_ATOMIC under rcu_read_lock sectionPablo Neira Ayuso2012-04-031-1/+1
| * Merge branch 'master' of git://1984.lsi.us.es/netDavid S. Miller2012-04-031-0/+2
| |\
| | * netfilter: xt_CT: remove a compile warningPablo Neira Ayuso2012-04-031-0/+2
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-04-021-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
* | | | ipset: Stop using NLA_PUT*().David S. Miller2012-04-0212-229/+271
* | | | ipvs: Stop using NLA_PUT*().David S. Miller2012-04-021-50/+58
* | | | nf_conntrack_core: Stop using NLA_PUT*().David S. Miller2012-04-011-2/+3
* | | | nf_conntrack_netlink: Stop using NLA_PUT*().David S. Miller2012-04-011-34/+49
* | | | nf_conntrack_proto_dccp: Stop using NLA_PUT*().David S. Miller2012-04-011-8/+10
* | | | nf_conntrack_proto_generic: Stop using NLA_PUT*().David S. Miller2012-04-011-1/+2
* | | | nf_conntrack_proto_gre: Stop using NLA_PUT*().David S. Miller2012-04-011-4/+5
* | | | nf_conntrack_proto_sctp: Stop using NLA_PUT*().David S. Miller2012-04-011-12/+10
* | | | nf_conntrack_proto_tcp: Stop using NLA_PUT*().David S. Miller2012-04-011-33/+35
* | | | nf_conntrack_proto_udp{,lite}: Stop using NLA_PUT*().David S. Miller2012-04-012-8/+10
* | | | nfnetlink_acct: Stop using NLA_PUT*().David S. Miller2012-04-011-4/+6
* | | | nfnetlink_cttimeout: Stop using NLA_PUT*().David S. Miller2012-04-011-5/+6
* | | | nfnetlink_log: Stop using NLA_PUT*().David S. Miller2012-04-011-42/+58
* | | | nfnetlink_queue: Stop using NLA_PUT*().David S. Miller2012-04-011-24/+35
| |_|/ |/| |
* | | net/netfilter/nfnetlink_acct.c: use linux/atomic.hAndrew Morton2012-04-011-1/+1
|/ /
* | 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
OpenPOWER on IntegriCloud