summaryrefslogtreecommitdiffstats
path: root/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-03-043-85/+59
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2017-03-033-85/+59
| |\
| | * netfilter: nf_tables: don't call nfnetlink_set_err() if nfnetlink_send() failsPablo Neira Ayuso2017-03-031-78/+55
| | * netfilter: nft_set_rbtree: incorrect assumption on lower interval lookupsPablo Neira Ayuso2017-03-031-5/+4
| | * netfilter: nf_conntrack_sip: fix wrong memory initialisationChristophe Leroy2017-03-031-2/+0
* | | sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>Ingo Molnar2017-03-021-0/+2
|/ /
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2017-02-283-4/+5
|\|
| * netfilter: nft_set_bitmap: incorrect bitmap sizePablo Neira Ayuso2017-02-261-1/+1
| * netfilter: nf_ct_expect: Change __nf_ct_expect_check() return value.Jarno Rajahalme2017-02-261-2/+2
| * netfilter: nf_ct_expect: nf_ct_expect_related_report(): Return zero on success.Jarno Rajahalme2017-02-251-1/+1
| * netfilter: nft_ct: fix random validation errors for zone set supportFlorian Westphal2017-02-231-0/+1
* | lib/vsprintf.c: remove %Z supportAlexey Dobriyan2017-02-277-11/+11
* | scripts/spelling.txt: add "aligment" pattern and fix typo instancesMasahiro Yamada2017-02-271-1/+1
* | scripts/spelling.txt: add "an user" pattern and fix typo instancesMasahiro Yamada2017-02-271-1/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2017-02-236-39/+81
|\
| * Merge branch 'master' of git://blackhole.kfki.hu/nfPablo Neira Ayuso2017-02-212-4/+7
| |\
| | * netfilter: ipset: Null pointer exception in ipset list:setVishwanath Pai2017-02-191-3/+6
| | * Fix bug: sometimes valid entries in hash:* types of sets were evictedJozsef Kadlecsik2017-02-191-1/+1
| * | netfilter: nfnetlink: remove static declaration from err_listLiping Zhang2017-02-211-1/+1
| * | netfilter: xt_hashlimit: Fix integer divide round to zero.Alban Browaeys2017-02-191-16/+9
| |/
| * netfilter: ctnetlink: Fix regression in CTA_HELP processingKevin Cernekee2017-02-061-4/+13
| * netfilter: ctnetlink: Fix regression in CTA_STATUS processingKevin Cernekee2017-02-061-1/+25
| * netfilter: nf_ct_helper: warn when not applying default helper assignmentJiri Kosina2017-02-061-13/+26
* | netfilter: nf_tables: honor NFT_SET_OBJECT in set backend selectionPablo Neira Ayuso2017-02-123-3/+4
* | netfilter: nf_tables: add NFTA_RULE_ID attributePablo Neira Ayuso2017-02-121-0/+26
* | netfilter: nf_tables: add check_genid to the nfnetlink subsystemPablo Neira Ayuso2017-02-121-0/+6
* | netfilter: nfnetlink: allow to check for generation IDPablo Neira Ayuso2017-02-121-4/+27
* | netfilter: nfnetlink: add nfnetlink_rcv_skb_batch()Pablo Neira Ayuso2017-02-121-23/+28
* | netfilter: nfnetlink: get rid of u_intX_t typesPablo Neira Ayuso2017-02-121-8/+8
* | netfilter: nf_ct_expect: nf_ct_expect_insert() returns voidGao Feng2017-02-121-5/+3
* | netfilter: nf_ct_sip: Use mod_timer_pending()Gao Feng2017-02-121-7/+5
* | netfilter: nft_exthdr: add TCP option matchingManuel Messner2017-02-082-15/+108
* | netfilter: nft_ct: add zone id set supportFlorian Westphal2017-02-081-1/+143
* | netfilter: nft_ct: prepare for key-dependent error unwindFlorian Westphal2017-02-081-14/+15
* | netfilter: nft_ct: add zone id get supportFlorian Westphal2017-02-081-3/+19
* | netfilter: nf_tables: add bitmap set typePablo Neira Ayuso2017-02-083-0/+321
* | netfilter: nf_tables: add space notation to setsPablo Neira Ayuso2017-02-083-5/+19
* | netfilter: nf_tables: rename struct nft_set_estimate class fieldPablo Neira Ayuso2017-02-083-8/+8
* | netfilter: nf_tables: add flush field to struct nft_set_iterPablo Neira Ayuso2017-02-081-0/+4
* | netfilter: nf_tables: rename deactivate_one() to flush()Pablo Neira Ayuso2017-02-083-9/+9
* | netfilter: nf_tables: use struct nft_set_iter in set element flushPablo Neira Ayuso2017-02-081-7/+5
* | netfilter: nf_tables: pass netns to set->ops->remove()Pablo Neira Ayuso2017-02-083-5/+7
* | netfilter: nft_exthdr: Add support for existence checkPhil Sutter2017-02-081-2/+20
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2017-02-0331-513/+461
|\ \
| * | netfilter: allow logging from non-init namespacesMichal Kubeček2017-02-021-0/+24
| * | ipvs: free ip_vs_dest structs when refcnt=0David Windsor2017-02-021-5/+3
| * | netfilter: merge ctinfo into nfct pointer storage areaFlorian Westphal2017-02-024-8/+12
| * | netfilter: guarantee 8 byte minalign for template addressesFlorian Westphal2017-02-021-5/+24
| * | netfilter: add and use nf_ct_set helperFlorian Westphal2017-02-023-14/+6
| * | skbuff: add and use skb_nfct helperFlorian Westphal2017-02-023-4/+4