summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2018-08-0519-230/+1266
|\
| * netfilter: nft_tunnel: fix sparse errorsPablo Neira Ayuso2018-08-041-5/+3
| * netfilter: conntrack: avoid use-after free on rmmodFlorian Westphal2018-08-031-4/+3
| * netfilter: kconfig: remove ct zone/label dependenciesFlorian Westphal2018-08-031-3/+3
| * netfilter: nf_tables: simplify NLM_F_CREATE handlingPablo Neira Ayuso2018-08-031-19/+10
| * netfilter: nf_tables: match on tunnel metadataPablo Neira Ayuso2018-08-031-1/+111
| * netfilter: nf_tables: add tunnel supportPablo Neira Ayuso2018-08-033-0/+465
| * netfilter: nft_tproxy: Add missing config checkMáté Eckl2018-08-031-0/+2
| * netfilter: cttimeout: Make NF_CT_NETLINK_TIMEOUT depend on NF_CONNTRACK_TIMEOUTHarsha Sharma2018-08-032-6/+1
| * netfilter: nf_tables: remove unused variableYueHaibing2018-08-031-2/+0
| * netfilter: nf_tables: flow event notifier must use transaction mutexFlorian Westphal2018-08-031-2/+2
| * netfilter: nfnetlink_osf: rename nf_osf header file to nfnetlink_osfFernando Fernandez Mancera2018-08-032-2/+2
| * netfilter: use kvmalloc_array to allocate memory for hashtableLi RongQing2018-08-034-28/+11
| * netfilter: nf_tables: Add native tproxy supportMáté Eckl2018-07-303-0/+325
| * netfilter: nf_tables: implement Passive OS fingerprint module in nft_osfFernando Fernandez Mancera2018-07-303-0/+114
| * netfilter: nfnetlink_osf: extract nfnetlink_subsystem code from xt_osf.cFernando Fernandez Mancera2018-07-302-146/+157
| * netfilter: nf_osf: rename nf_osf.c to nfnetlink_osf.cFernando Fernandez Mancera2018-07-303-6/+11
| * netfilter: use PTR_ERR_OR_ZERO()YueHaibing2018-07-302-6/+2
| * netfilter: nf_osf: add nf_osf_find()Pablo Neira Ayuso2018-07-301-0/+30
| * netfilter: nf_tables: handle meta/lookup with direct callFlorian Westphal2018-07-303-7/+21
* | net: Remove some unneeded semicolonzhong jiang2018-08-041-1/+1
|/
* Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-07-246-147/+189
|\
| * netfilter: nf_tables: move dumper state allocation into ->startFlorian Westphal2018-07-241-104/+115
| * netfilter: conntrack: dccp: treat SYNC/SYNCACK as invalid if no prior stateFlorian Westphal2018-07-201-4/+4
| * netfilter: nf_tables: don't allow to rename to already-pending nameFlorian Westphal2018-07-201-13/+29
| * netfilter: nf_tables: fix memory leaks on chain renameFlorian Westphal2018-07-201-6/+11
| * netfilter: nf_tables: free flow table struct tooFlorian Westphal2018-07-201-0/+1
| * netfilter: nf_tables: use dev->name directlyFlorian Westphal2018-07-201-9/+5
| * netfilter: nft_set_rbtree: fix panic when destroying set by GCTaehee Yoo2018-07-181-2/+5
| * netfilter: nft_set_hash: add rcu_barrier() in the nft_rhash_destroy()Taehee Yoo2018-07-181-0/+1
| * netfilter: nf_tables: fix jumpstack depth validationTaehee Yoo2018-07-173-9/+18
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2018-07-2039-993/+2556
|\ \
| * | netfilter: nft_socket: Expose socket markMáté Eckl2018-07-181-0/+11
| * | netfilter: nft_socket: Break evaluation if no socket foundMáté Eckl2018-07-181-1/+1
| * | netfilter: nf_osf: add struct nf_osf_hdr_ctxPablo Neira Ayuso2018-07-181-43/+62
| * | netfilter: nf_osf: add nf_osf_match_one()Pablo Neira Ayuso2018-07-181-96/+111
| * | netfilter: nf_tables: use dedicated mutex to guard transactionsFlorian Westphal2018-07-184-28/+76
| * | netfilter: nf_tables: avoid global info storageFlorian Westphal2018-07-181-16/+12
| * | netfilter: nf_tables: take module reference when starting a batchFlorian Westphal2018-07-182-0/+10
| * | netfilter: nf_tables: make valid_genid callback mandatoryFlorian Westphal2018-07-182-3/+3
| * | netfilter: nf_tables: add and use helper for module autoloadFlorian Westphal2018-07-181-29/+52
| * | netfilter: Remove useless param helper of nf_ct_helper_ext_addGao Feng2018-07-185-8/+6
| * | ipvs: drop conn templates under attackJulian Anastasov2018-07-181-20/+39
| * | ipvs: add assured state for conn templatesJulian Anastasov2018-07-185-14/+27
| * | ipvs: provide just conn to ip_vs_state_nameJulian Anastasov2018-07-182-8/+8
| * | netfilter: nf_conntrack: resolve clash for matching conntracksMartynas Pumputis2018-07-181-8/+22
| * | netfilter: nf_conncount: Add list lock and gc worker, and RCU for init tree s...Yi-Hung Wei2018-07-182-87/+183
| * | netfilter: nf_conncount: Split insert and traversalYi-Hung Wei2018-07-181-20/+67
| * | netfilter: nf_conncount: Move locking into count_tree()Yi-Hung Wei2018-07-181-27/+25
| * | netfilter: nf_conncount: Early exit in nf_conncount_lookup() and cleanupYi-Hung Wei2018-07-182-21/+26