summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Pablo Neira Ayuso2015-10-174-9/+9
|\
| * ipv4: Pass struct net into ip_defrag and ip_check_defragEric W. Biederman2015-10-121-1/+1
| * net/nfnetlink: lockdep_nfnl_is_held can be booleanYaowei Bai2015-10-091-1/+1
| * ipv4, ipv6: Pass net into ip_local_out and ip6_local_outEric W. Biederman2015-10-081-2/+2
| * ipv6: Merge ip6_local_out and ip6_local_out_skEric W. Biederman2015-10-081-1/+1
| * ipv4: Merge ip_local_out and ip_local_out_skEric W. Biederman2015-10-081-1/+1
| * net: Pass net into dst_output and remove dst_output_okfnEric W. Biederman2015-10-081-2/+2
| * nfnetlink: use y2038 safe timestampArnd Bergmann2015-10-051-3/+3
* | netfilter: nf_queue: remove rcu_read_lock callsFlorian Westphal2015-10-161-12/+4
* | netfilter: make nf_queue_entry_get_refs return voidFlorian Westphal2015-10-163-18/+6
* | netfilter: remove hook owner refcountingFlorian Westphal2015-10-164-19/+0
* | netfilter: nfnetlink_log: validate dependencies to avoid breaking atomicityPablo Neira2015-10-151-19/+24
* | netfilter: nfnetlink_log: consolidate check for instance in nfulnl_recv_config()Pablo Neira Ayuso2015-10-151-23/+5
* | netfilter: nfqueue: don't use prev pointerFlorian Westphal2015-10-131-4/+2
* | netfilter: nfnetlink_log: autoload nf_conntrack_netlink module NFQA_CFG_F_CON...Ken-ichirou MATSUZAWA2015-10-121-1/+10
* | Merge tag 'ipvs4-for-v4.4' of https://git.kernel.org/pub/scm/linux/kernel/git...Pablo Neira Ayuso2015-10-122-10/+6
|\ \
| * | ipvs: Remove possibly unused variables from ip_vs_conn_net_{init,cleanup}Simon Horman2015-10-071-8/+5
| * | ipvs: Remove possibly unused variable from ip_vs_outDavid Ahern2015-10-071-2/+1
* | | nfnetlink_cttimeout: add rcu_barrier() on module removalPablo Neira Ayuso2015-10-121-0/+1
* | | netfilter: conntrack: fix crash on timeout object removalPablo Neira Ayuso2015-10-123-5/+44
* | | netfilter: xt_CT: don't put back reference to timeout policy objectPablo Neira Ayuso2015-10-121-0/+3
|/ /
* | netfilter: nfnetlink_log: allow to attach conntrackKen-ichirou MATSUZAWA2015-10-052-9/+37
* | netfilter: ctnetlink: add const qualifier to nfnl_hook.get_ctKen-ichirou MATSUZAWA2015-10-051-1/+1
* | netfilter: Kconfig rename QUEUE_CT to GLUE_CTKen-ichirou MATSUZAWA2015-10-052-9/+9
* | netfilter: nfnetlink_queue: rename related to nfqueue attaching conntrack infoKen-ichirou MATSUZAWA2015-10-053-47/+47
* | netfilter: nfnetlink_queue: use y2038 safe timestampPablo Neira Ayuso2015-10-051-3/+4
* | Merge tag 'ipvs3-for-v4.4' of https://git.kernel.org/pub/scm/linux/kernel/git...Pablo Neira Ayuso2015-10-051-2/+0
|\ \
| * | ipvs: Don't protect ip_vs_addr_is_unicast with CONFIG_SYSCTLEric W. Biederman2015-10-011-2/+0
| |/
* | netfilter: rename nfnetlink_queue_core.c to nfnetlink_queue.cPablo Neira Ayuso2015-10-042-1/+0
* | netfilter: nfnetlink_queue: get rid of nfnetlink_queue_ct.cPablo Neira Ayuso2015-10-045-132/+95
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2015-09-2919-519/+449
|\
| * ipv6: Pass struct net into ip6_route_me_harderEric W. Biederman2015-09-291-1/+1
| * ipv4: Pass struct net into ip_route_me_harderEric W. Biederman2015-09-291-1/+1
| * netfilter: Push struct net down into nf_afinfo.rerouteEric W. Biederman2015-09-291-1/+1
| * ipv4: Push struct net down into nf_send_resetEric W. Biederman2015-09-291-1/+1
| * ipvs: Pass ipvs into ip_vs_gather_fragsEric W. Biederman2015-09-241-4/+5
| * ipvs: Remove skb_sknetEric W. Biederman2015-09-241-15/+10
| * ipvs: Pass ipvs not net to ip_vs_protocol_net_(init|cleanup)Eric W. Biederman2015-09-242-8/+6
| * ipvs: Remove net argument from ip_vs_tcp_conn_listenEric W. Biederman2015-09-242-8/+4
| * ipvs: Pass ipvs through ip_vs_route_me_harder into sysctl_snat_rerouteEric W. Biederman2015-09-241-8/+7
| * ipvs: Pass ipvs into ip_vs_out_icmp and ip_vs_out_icmp_v6Eric W. Biederman2015-09-241-8/+7
| * ipvs: Pass ipvs into ip_vs_in_icmp and ip_vs_in_icmp_v6Eric W. Biederman2015-09-241-22/+14
| * ipvs: Pass ipvs into ip_vs_inEric W. Biederman2015-09-241-9/+5
| * ipvs: Pass ipvs into ip_vs_outEric W. Biederman2015-09-241-9/+6
| * ipvs: Pass ipvs not net into sysctl_nat_icmp_sendEric W. Biederman2015-09-241-4/+3
| * ipvs: Simplify ipvs and net access in ip_vs_leaveEric W. Biederman2015-09-241-6/+2
| * ipvs: Wrap sysctl_cache_bypass and remove ifdefs in ip_vs_leaveEric W. Biederman2015-09-241-10/+3
| * ipvs: Better derivation of ipvs in ip_vs_in_stats and ip_vs_out_statsEric W. Biederman2015-09-241-2/+2
| * ipvs: Pass ipvs into ensure_mtu_is adequateEric W. Biederman2015-09-241-6/+5
| * ipvs: Pass ipvs into __ip_vs_get_out_rt_v6Eric W. Biederman2015-09-241-8/+13