summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-081-1/+0
|\
| * drop "select GCD" from three Kconfig filesPaul Bolle2011-11-131-1/+0
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-01-024-6/+12
|\ \
| * | netfilter: ctnetlink: fix timeout calculationXi Wang2011-12-311-2/+2
| * | ipvs: try also real server with port 0 in backup serverJulian Anastasov2011-12-313-4/+10
* | | netfilter: nfnetlink_acct: fix nfnl_acct_get operationPablo Neira Ayuso2012-01-011-4/+13
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-12-301-5/+13
|\ \ \ | |/ /
| * | Merge branch 'nf' of git://1984.lsi.us.es/netDavid S. Miller2011-12-241-5/+13
| |\ \
| | * | netfilter: ctnetlink: fix scheduling while atomic if helper is autoloadedPablo Neira Ayuso2011-12-241-0/+3
| | * | netfilter: ctnetlink: fix return value of ctnetlink_get_expect()Pablo Neira Ayuso2011-12-241-5/+10
* | | | netfilter: Kconfig: fix unmet xt_nfacct dependenciesPablo Neira Ayuso2011-12-291-1/+1
* | | | ipv6: Kill rt6i_dev and rt6i_expires defines.David S. Miller2011-12-282-2/+2
* | | | netfilter: provide config option to disable ancient procfs partsJan Engelhardt2011-12-273-8/+18
* | | | netfilter: xtables: collapse conditions in xt_ecnJan Engelhardt2011-12-271-9/+6
* | | | netfilter: xtables: add an IPv6 capable version of the ECN matchPatrick McHardy2011-12-271-26/+80
* | | | netfilter: xtables: give xt_ecn its own nameJan Engelhardt2011-12-271-17/+17
* | | | netfilter: xtables: move ipt_ecn to xt_ecnJan Engelhardt2011-12-273-0/+138
* | | | Merge branch 'nf-next' of git://1984.lsi.us.es/net-nextDavid S. Miller2011-12-2513-107/+590
|\ \ \ \
| * | | | netfilter: xtables: add nfacct match to support extended accountingPablo Neira Ayuso2011-12-253-0/+87
| * | | | netfilter: add extended accounting infrastructure over nfnetlinkPablo Neira Ayuso2011-12-253-0/+361
| * | | | netfilter: ctnetlink: get and zero operations must be atomicPablo Neira Ayuso2011-12-241-45/+39
| * | | | netfilter: nf_nat: use hash random for bysource hashPatrick McHardy2011-12-231-0/+1
| * | | | netfilter: nf_nat: export NAT definitions to userspacePatrick McHardy2011-12-231-2/+2
| * | | | netfilter: rework user-space expectation helper supportPablo Neira Ayuso2011-12-234-46/+42
| * | | | netfilter: ctnetlink: support individual atomic-get-and-reset of countersPablo Neira Ayuso2011-12-181-0/+11
| * | | | netfilter: ctnetlink: use expect instead of master tuple in get operationPablo Neira Ayuso2011-12-181-1/+3
| * | | | netfilter: nf_conntrack: use atomic64 for accounting countersEric Dumazet2011-12-184-31/+31
| * | | | IPVS: Modify the SH scheduler to use weightsMichael Maxim2011-12-132-1/+32
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-12-231-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | netfilter: xt_connbytes: handle negation correctlyFlorian Westphal2011-12-231-3/+3
| | |/ / | |/| |
* | | | module_param: make bool parameters really bool (net & drivers/net)Rusty Russell2011-12-194-4/+4
* | | | net: fix assignment of 0/1 to bool variables.Rusty Russell2011-12-191-2/+2
* | | | net: two vzalloc() cleanupsEric Dumazet2011-12-191-2/+1
* | | | net:netfilter: use IS_ENABLEDIgor Maravić2011-12-1619-46/+45
* | | | net: use IS_ENABLED(CONFIG_IPV6)Eric Dumazet2011-12-111-6/+3
| |/ / |/| |
* | | ipv6: Add fragment reporting to ipv6_skip_exthdr().Jesse Gross2011-12-036-6/+14
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-12-026-44/+73
|\ \ \ | |/ /
| * | netfilter: Remove ADVANCED dependency from NF_CONNTRACK_NETBIOS_NSDavid S. Miller2011-12-011-1/+0
| * | Merge branch 'nf' of git://1984.lsi.us.es/netDavid S. Miller2011-11-295-43/+73
| |\ \
| | * | netfilter: nf_conntrack: make event callback registration per-netnsPablo Neira Ayuso2011-11-222-40/+70
| | * | netfilter: ipset: suppress compile-time warnings in ip_set_hash_ipport*.cJozsef Kadlecsik2011-11-213-3/+3
| | |/
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-11-261-1/+0
|\ \ \ | |/ /
| * | netfilter: Remove NOTRACK/RAW dependency on NETFILTER_ADVANCED.David S. Miller2011-11-231-1/+0
| |/
* | net: remove ipv6_addr_copy()Alexey Dobriyan2011-11-228-15/+15
* | netfilter: use jump_label for nf_hooksEric Dumazet2011-11-211-1/+12
|/
* Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-068-0/+9
|\
| * net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modulesPaul Gortmaker2011-10-315-0/+5
| * net: add moduleparam.h for users of module_param/MODULE_PARM_DESCPaul Gortmaker2011-10-311-0/+1
| * net: Fix files explicitly needing to include module.hPaul Gortmaker2011-10-313-0/+3
* | netfilter: do not propagate nf_queue errors in nf_hook_slowFlorian Westphal2011-11-011-6/+5
OpenPOWER on IntegriCloud