summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2019-01-153-14/+18
|\
| * netfilter: nft_flow_offload: fix checking method of conntrack helperHenry Yen2019-01-141-1/+4
| * netfilter: nft_flow_offload: fix interaction with vrf slave devicewenxu2019-01-112-4/+5
| * netfilter: nft_flow_offload: Fix reverse route lookupwenxu2019-01-091-2/+2
| * netfilter: nf_tables: selective rule dump needs table to be specifiedPablo Neira Ayuso2019-01-081-1/+1
| * netfilter: nf_tables: fix leaking object reference countTaehee Yoo2019-01-081-0/+2
| * netfilter: nf_tables: Fix for endless loop when dumping rulesetPhil Sutter2019-01-081-6/+4
* | jump_label: move 'asm goto' support test to KconfigMasahiro Yamada2019-01-061-3/+3
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2019-01-033-173/+133
|\
| * netfilter: nf_conncount: fix argument order to find_next_bitFlorian Westphal2018-12-291-1/+1
| * netfilter: nf_conncount: speculative garbage collection on empty listsPablo Neira Ayuso2018-12-291-32/+15
| * netfilter: nf_conncount: move all list iterations under spinlockPablo Neira Ayuso2018-12-291-26/+20
| * netfilter: nf_conncount: merge lookup and add functionsFlorian Westphal2018-12-292-91/+69
| * netfilter: nf_conncount: restart search when nodes have been erasedFlorian Westphal2018-12-291-11/+7
| * netfilter: nf_conncount: split gc in two phasesFlorian Westphal2018-12-291-3/+19
| * netfilter: nf_conncount: don't skip eviction when age is negativeFlorian Westphal2018-12-291-1/+1
| * netfilter: nf_conncount: replace CONNCOUNT_LOCK_SLOTS with CONNCOUNT_SLOTSShawn Bohrer2018-12-291-14/+5
| * netfilter: nf_tables: fix a missing check of nla_put_failureKangjie Lu2018-12-291-0/+2
* | mm: convert totalram_pages and totalhigh_pages variables to atomicArun KS2018-12-282-2/+2
* | mm: reference totalram_pages and managed_pages once per functionArun KS2018-12-282-5/+7
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2018-12-2030-1170/+1007
|\
| * netfilter: conntrack: remove empty pernet fini stubsFlorian Westphal2018-12-215-42/+10
| * netfilter: conntrack: merge ecache and timestamp sysctl tables with main oneFlorian Westphal2018-12-213-128/+35
| * netfilter: conntrack: merge acct and helper sysctl table with main oneFlorian Westphal2018-12-213-128/+22
| * netfilter: conntrack: add mnemonics for sysctl tableFlorian Westphal2018-12-211-11/+20
| * netfilter: conntrack: un-export seq_print_acctFlorian Westphal2018-12-212-19/+18
| * netfilter: conntrack: register sysctl table for greYafang Shao2018-12-211-1/+41
| * netfilter: conntrack: udp: set stream timeout to 2 minutesFlorian Westphal2018-12-211-1/+1
| * netfilter: conntrack: udp: only extend timeout to stream mode after 2sFlorian Westphal2018-12-211-3/+13
| * netfilter: nf_tables: Speed up selective rule dumpsPhil Sutter2018-12-181-28/+62
| * netfilter: nf_nat_sip: fix RTP/RTCP source port translationsAlin Nastac2018-12-171-4/+35
| * netfilter: nat: remove nf_nat_l4proto structFlorian Westphal2018-12-178-202/+2
| * netfilter: nat: remove l4proto->manip_pktFlorian Westphal2018-12-178-250/+354
| * netfilter: nat: remove l4proto->nlattr_to_rangeFlorian Westphal2018-12-177-58/+17
| * netfilter: nat: remove l4proto->in_rangeFlorian Westphal2018-12-177-55/+43
| * netfilter: nat: fold in_range indirection into callerFlorian Westphal2018-12-171-7/+16
| * netfilter: nat: remove l4proto->unique_tupleFlorian Westphal2018-12-172-26/+56
| * netfilter: nat: un-export nf_nat_l4proto_unique_tupleFlorian Westphal2018-12-176-129/+75
| * netfilter: remove NF_NAT_RANGE_PROTO_RANDOM supportFlorian Westphal2018-12-171-7/+2
| * netfilter: remove unused parameters in nf_ct_l4proto_[un]register_sysctl()Yafang Shao2018-12-171-14/+7
| * netfilter: nat: limit port clash resolution attemptsFlorian Westphal2018-12-171-6/+23
| * netfilter: nat: remove unnecessary 'else if' branchXiaozhou Liu2018-12-171-2/+0
| * netfilter: ipset: replace a strncpy() with strscpy()Qian Cai2018-12-141-2/+4
| * netfilter: ipset: fix ip_set_byindex functionFlorent Fourcot2018-12-141-1/+1
| * netfilter: nat: remove l4 protocol port roversFlorian Westphal2018-12-015-26/+7
| * netfilter: Replace call_rcu_bh(), rcu_barrier_bh(), and synchronize_rcu_bh()Paul E. McKenney2018-12-013-5/+5
| * netfilter: nf_flow_table: simplify nf_flow_offload_gc_step()Taehee Yoo2018-11-121-27/+7
| * netfilter: nf_flow_table: make nf_flow_table_iterate() staticTaehee Yoo2018-11-121-4/+4
| * netfilter: ctnetlink: always honor CTA_MARK_MASKAndreas Jaggi2018-11-121-10/+19
| * Merge branch 'master' of git://blackhole.kfki.hu/nf-nextPablo Neira Ayuso2018-11-124-40/+174
| |\