summaryrefslogtreecommitdiffstats
path: root/net/netfilter (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2020-09-098-33/+95
|\
| * netfilter: nf_tables: add userdata support for nft_objectJose M. Guisado Gomez2020-09-081-8/+27
| * ipvs: remove dependency on ip6_tablesYaroslav Bolyukin2020-08-311-1/+0
| * netfilter: nft_socket: add wildcard supportBalazs Scheidler2020-08-291-0/+27
| * netfilter: xt_HMARK: Use ip_is_fragment() helperYueHaibing2020-08-281-1/+1
| * netfilter: conntrack: remove unneeded nf_ct_putFlorian Westphal2020-08-281-4/+3
| * netfilter: conntrack: add clash resolution stat counterFlorian Westphal2020-08-283-6/+9
| * netfilter: conntrack: remove ignore statsFlorian Westphal2020-08-283-5/+2
| * netfilter: conntrack: do not increment two error counters at same timeFlorian Westphal2020-08-281-4/+1
| * netfilter: nf_tables: add userdata attributes to nft_tableJose M. Guisado Gomez2020-08-281-1/+21
| * ipvs: Fix uninit-value in do_ip_vs_set_ctl()Peilin Ye2020-08-281-3/+4
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netLinus Torvalds2020-09-0412-74/+140
|\ \
| * | netfilter: conntrack: do not auto-delete clash entries on replyFlorian Westphal2020-08-292-17/+11
| * | netfilter: nfnetlink: nfnetlink_unicast() reports EAGAIN instead of ENOBUFSPablo Neira Ayuso2020-08-284-38/+39
| * | netfilter: delete repeated wordsRandy Dunlap2020-08-283-3/+3
| * | netfilter: nf_tables: fix destination register zeroingFlorian Westphal2020-08-211-1/+3
| * | netfilter: nf_tables: add NFTA_SET_USERDATA if not nullPablo Neira Ayuso2020-08-211-1/+2
| * | netfilter: nft_set_rbtree: Detect partial overlap with start endpoint matchStefano Brivio2020-08-211-1/+33
| * | netfilter: nft_set_rbtree: Handle outcomes of tree rotations in overlap detec...Stefano Brivio2020-08-211-9/+14
| * | netfilter: conntrack: allow sctp hearbeat after connection re-useFlorian Westphal2020-08-201-4/+35
| |/
* / treewide: Use fallthrough pseudo-keywordGustavo A. R. Silva2020-08-242-2/+2
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2020-08-173-27/+20
|\
| * netfilter: nf_tables: free chain context when BINDING flag is missingFlorian Westphal2020-08-131-2/+4
| * netfilter: nft_compat: remove flush counter optimizationFlorian Westphal2020-08-101-23/+14
| * netfilter: nf_tables: nft_exthdr: the presence return value should be little-...Stephen Suryaputra2020-08-101-2/+2
* | Merge tag 'locking-urgent-2020-08-10' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2020-08-112-4/+5
|\ \ | |/ |/|
| * netfilter: nft_set_rbtree: Use sequence counter with associated rwlockAhmed S. Darwish2020-07-291-2/+2
| * netfilter: conntrack: Use sequence counter with associated spinlockAhmed S. Darwish2020-07-291-2/+3
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-nextLinus Torvalds2020-08-0635-255/+554
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2020-08-045-19/+43
| |\ \
| | * | netfilter: flowtable: Set offload timeout when adding flowRoi Dayan2020-08-031-0/+2
| | * | netfilter: conntrack: Move nf_ct_offload_timeout to header fileRoi Dayan2020-08-031-12/+0
| | * | netfilter: nft_meta: fix iifgroup matchingFlorian Westphal2020-08-021-1/+1
| | * | netfilter: nft_compat: make sure xtables destructors have runFlorian Westphal2020-07-312-6/+40
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2020-08-0427-82/+137
| |\ \ \
| | * | | netfilter: nf_tables: report EEXIST on overlapsPablo Neira Ayuso2020-08-021-9/+7
| | * | | netfilter: nf_tables: extended netlink error reporting for expressionsPablo Neira Ayuso2020-08-021-1/+6
| | * | | netfilter: Replace HTTP links with HTTPS onesAlexander A. Klimov2020-07-297-8/+8
| | * | | netfilter: Use fallthrough pseudo-keywordGustavo A. R. Silva2020-07-2216-35/+33
| | * | | ipvs: queue delayed work to expire no destination connections if expire_nodes...Andrew Sy Kim2020-07-223-27/+81
| | * | | netfilter: nf_tables: Fix a use after free in nft_immediate_destroy()Dan Carpenter2020-07-151-2/+2
| * | | | net: remove sockptr_advanceChristoph Hellwig2020-07-281-3/+4
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/netDavid S. Miller2020-07-262-31/+22
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | netfilter: switch nf_setsockopt to sockptr_tChristoph Hellwig2020-07-252-3/+3
| * | | | netfilter: switch xt_copy_counters to sockptr_tChristoph Hellwig2020-07-251-10/+10
| * | | | netfilter: split nf_sockoptChristoph Hellwig2020-07-201-17/+13
| * | | | netfilter: remove the compat argument to xt_copy_counters_from_userChristoph Hellwig2020-07-201-5/+4
| * | | | netfilter: remove the compat_{get,set} methodsChristoph Hellwig2020-07-201-42/+0
| | |/ / | |/| |
| * | | net: sched: Pass qdisc reference in struct flow_block_offloadPetr Machata2020-07-142-2/+2
| * | | net: netfilter: kerneldoc fixesAndrew Lunn2020-07-143-9/+9