summaryrefslogtreecommitdiff
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2009-12-0810-112/+99
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2009-12-036-64/+74
| |\
| | * netfilter: xtables: fix conntrack match v1 ipt-save outputFlorian Westphal2009-11-231-44/+17
| | * netfilter: nf_ct_tcp: improve out-of-sync situation in TCP trackingPablo Neira Ayuso2009-11-231-10/+41
| | * netfilter: remove unneccessary checks from netlink notifiersPatrick McHardy2009-11-062-4/+2
| | * netfilter: nf_conntrack: avoid additional compare.Changli Gao2009-11-051-4/+10
| | * netfilter: xt_socket: make module available for INPUT chainJan Engelhardt2009-10-291-2/+4
| * | net: Simplify conntrack_proto_gre pernet operations.Eric W. Biederman2009-12-011-14/+6
| * | net: Simplify conntrack_proto_dccp pernet operations.Eric W. Biederman2009-12-011-23/+8
| * | net: Move && and || to end of previous lineJoe Perches2009-11-292-7/+7
| * | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2009-11-293-15/+7
| |\ \
| * | | net: use net_eq to compare netsOctavian Purdila2009-11-251-1/+1
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2009-11-181-0/+1
| |\ \ \
| * | | | netns: net_identifiers should be read_mostlyEric Dumazet2009-11-182-2/+2
| * | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2009-11-081-6/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2009-11-062-38/+34
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | inet: rename some inet_sock fieldsEric Dumazet2009-10-181-1/+1
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6Linus Torvalds2009-12-0814-71/+23
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Merge commit 'v2.6.32-rc7'Eric W. Biederman2009-11-173-44/+38
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | sysctl net: Remove unused binary sysctl codeEric W. Biederman2009-11-1214-71/+23
* | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2009-11-231-1/+1
|\ \ \ \ \ \
| * | | | | | netfilter: xt_limit: fix invalid return code in limit_mt_check()Patrick McHardy2009-11-231-1/+1
| * | | | | | netfilter: nf_log: fix sleeping function called from invalid context in seq_s...Wu Fengguang2009-11-131-13/+5
| * | | | | | netfilter: xt_osf: fix xt_osf_remove_callback() return valueRoel Kluin2009-11-131-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | netfilter: nf_log: fix sleeping function called from invalid context in seq_s...Patrick McHardy2009-11-191-13/+5
* | | | | | netfilter: xt_osf: fix xt_osf_remove_callback() return valuePatrick McHardy2009-11-191-1/+1
| |_|/ / / |/| | | |
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-11-093-44/+38
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | netfilter: xt_connlimit: fix regression caused by zero family valueJan Engelhardt2009-11-061-6/+4
| | |/ | |/|
| * | netfilter: nf_nat: fix NAT issue in 2.6.30.4+Jozsef Kadlecsik2009-11-062-38/+34
| |/
* | headers: remove sched.h from interrupt.hAlexey Dobriyan2009-10-111-0/+1
|/
* net: Make setsockopt() optlen be unsigned.David S. Miller2009-09-301-2/+2
* sysctl: remove "struct file *" argument of ->proc_handlerAlexey Dobriyan2009-09-242-6/+6
* mm: replace various uses of num_physpages by totalram_pagesJan Beulich2009-09-223-7/+7
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2009-09-1018-869/+136
|\
| * IPVS: Add handling of incoming ICMPV6 messagesJulius Volz2009-08-311-6/+17
| * netfilter: nf_conntrack: netns fix re reliable conntrack event deliveryAlexey Dobriyan2009-08-311-3/+3
| * ipvs: Use atomic operations atomiclySimon Horman2009-08-312-6/+7
| * netfilter: nfnetlink: constify message attributes and headersPatrick McHardy2009-08-256-30/+49
| * netfilter: xtables: mark initial tables constantJan Engelhardt2009-08-241-3/+4
| * netfilter: xtables: remove xt_owner v0Jan Engelhardt2009-08-101-118/+12
| * netfilter: xtables: remove xt_mark v0Jan Engelhardt2009-08-101-76/+10
| * netfilter: xtables: remove xt_iprange v0Jan Engelhardt2009-08-101-43/+2
| * netfilter: xtables: remove xt_conntrack v0Jan Engelhardt2009-08-101-154/+1
| * netfilter: xtables: remove xt_connmark v0Jan Engelhardt2009-08-101-90/+11
| * netfilter: xtables: remove xt_MARK v0, v1Jan Engelhardt2009-08-101-154/+9
| * netfilter: xtables: remove xt_CONNMARK v0Jan Engelhardt2009-08-101-123/+11
| * netfilter: xtables: remove xt_TOS v0Jan Engelhardt2009-08-102-63/+0
* | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2009-09-022-2/+2
|\ \ | |/ |/|
| * netfilter: xt_quota: fix wrong return value (error case)Patrick McHardy2009-08-231-1/+1
| * net: restore gnet_stats_basic to previous definitionEric Dumazet2009-08-171-1/+1