summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* netfilter: nf_conntrack: make nf_ct_zone_dflt built-inDaniel Borkmann2015-09-022-7/+6
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-08-288-136/+387
|\
| * netfilter: reduce sparse warningsFlorian Westphal2015-08-282-6/+3
| * Merge tag 'ipvs2-for-v4.3' of https://git.kernel.org/pub/scm/linux/kernel/git...Pablo Neira Ayuso2015-08-265-128/+382
| |\
| | * ipvs: add more mcast parameters for the sync daemonJulian Anastasov2015-08-212-24/+164
| | * ipvs: add sync_maxlen parameter for the sync daemonJulian Anastasov2015-08-212-94/+96
| | * ipvs: call rtnl_lock earlyJulian Anastasov2015-08-212-19/+33
| | * ipvs: Add ovf schedulerRaducu Deaconu2015-08-213-0/+98
| * | netfilter: xt_TEE: use IS_ENABLED(CONFIG_NF_DUP_IPV6)Pablo Neira Ayuso2015-08-211-2/+2
| |/
* | netfilter: connlabels: Export setting connlabel lengthJoe Stringer2015-08-272-12/+36
* | netfilter: Always export nf_connlabels_replace()Joe Stringer2015-08-271-2/+0
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Pablo Neira Ayuso2015-08-2110-23/+21
|\
| * net: Change pseudohdr argument of inet_proto_csum_replace* to be a boolTom Herbert2015-08-178-14/+15
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-08-133-10/+7
| |\
| | * netfilter: conntrack: Use flags in nf_ct_tmpl_alloc()Joe Stringer2015-08-051-2/+2
| | * netfilter: nf_conntrack: checking for IS_ERR() instead of NULLDan Carpenter2015-07-302-5/+4
| | * netfilter: nf_conntrack: silence warning on falling back to vmalloc()Pablo Neira Ayuso2015-07-301-3/+1
* | | netfilter: nft_payload: work around vlan header strippingFlorian Westphal2015-08-191-1/+56
* | | netfilter: nf_conntrack: add efficient mark to zone mappingDaniel Borkmann2015-08-183-38/+22
* | | netfilter: nf_conntrack: add direction support for zonesDaniel Borkmann2015-08-186-88/+210
* | | netfilter: nf_conntrack: push zone object into functionsDaniel Borkmann2015-08-1110-97/+143
* | | netfilter: nfacct: per network namespace supportAndreas Schultz2015-08-072-22/+51
* | | netfilter: nft_limit: add per-byte limitingPablo Neira Ayuso2015-08-071-4/+59
* | | netfilter: nft_limit: constant token cost per packetPablo Neira Ayuso2015-08-071-7/+18
* | | netfilter: nft_limit: add burst parameterPablo Neira Ayuso2015-08-071-2/+18
* | | netfilter: nft_limit: factor out shared code with per-byte limitingPablo Neira Ayuso2015-08-071-33/+53
* | | netfilter: nft_limit: convert to token-based limiting at nanosecond granularityPablo Neira Ayuso2015-08-071-16/+26
* | | netfilter: nft_limit: rename to nft_limit_pktsPablo Neira Ayuso2015-08-071-6/+6
* | | netfilter: factor out packet duplication for IPv4/IPv6Pablo Neira Ayuso2015-08-072-152/+8
* | | netfilter: xt_TEE: get rid of WITH_CONNTRACK definitionPablo Neira Ayuso2015-08-071-5/+3
* | | netfilter: nft_counter: convert it to use per-cpu countersPablo Neira Ayuso2015-08-071-28/+69
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-08-049-102/+297
|\ \
| * | netfilter: nf_ct_sctp: minimal multihoming supportMichal Kubeček2015-07-301-24/+77
| * | netfilter: rename local nf_hook_list to hook_listPablo Neira Ayuso2015-07-231-14/+14
| * | netfilter: fix possible removal of wrong hookPablo Neira Ayuso2015-07-231-22/+19
| * | netfilter: nf_queue: fix nf_queue_nf_hook_drop()Pablo Neira Ayuso2015-07-233-11/+5
| * | netfilter: Fix memory leak in nf_register_net_hookEric W. Biederman2015-07-201-1/+3
| * | netfilter: add and use jump label for xt_teeFlorian Westphal2015-07-152-0/+5
| * | netfilter: xtables: don't save/restore jumpstack offsetFlorian Westphal2015-07-151-11/+11
| * | netfilter: move tee_active to coreFlorian Westphal2015-07-152-7/+9
| * | netfilter: xtables: compute exact size needed for jumpstackFlorian Westphal2015-07-151-0/+4
| * | netfilter: nftables: Only run the nftables chains in the proper netnsEric W. Biederman2015-07-152-7/+6
| * | netfilter: Per network namespace netfilter hooks.Eric W. Biederman2015-07-151-21/+161
| * | netfilter: Factor out the hook list selection from nf_register_hookEric W. Biederman2015-07-151-14/+18
| * | netfilter: Simply the tests for enabling and disabling the ingress queue hookEric W. Biederman2015-07-151-11/+6
| * | ipvs: Delete an unnecessary check before the function call "module_put"Markus Elfring2015-07-151-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-07-3111-77/+163
|\ \ \ | | |/ | |/|
| * | netfilter: nf_conntrack: Support expectations in different zonesJoe Stringer2015-07-221-1/+2
| * | Merge tag 'ipvs-fixes-for-v4.2' of https://git.kernel.org/pub/scm/linux/kerne...Pablo Neira Ayuso2015-07-205-39/+110
| |\ \
| | * | ipvs: call skb_sender_cpu_clearJulian Anastasov2015-07-141-0/+6