aboutsummaryrefslogtreecommitdiff
path: root/include/net/netfilter
Commit message (Expand)AuthorAgeFilesLines
* Merge android-4.9.224(5791e89) into msm-4.9jianzhou2020-05-221-1/+1
|\
| * Merge 4.9.224 into android-4.9-qGreg Kroah-Hartman2020-05-201-1/+1
| |\
| | * netfilter: conntrack: avoid gcc-10 zero-length-bounds warningArnd Bergmann2020-05-201-1/+1
* | | Merge android-4.9.201(09bf7fb) into msm-4.9jianzhou2019-12-161-1/+2
|\| |
| * | Merge 4.9.201 into android-4.9-qGreg Kroah-Hartman2019-11-141-1/+2
| |\|
| | * netfilter: nf_tables: Align nft_expr private data to 64-bitLukas Wunner2019-11-121-1/+2
| * | Merge 4.9.190 into android-4.9-qGreg Kroah-Hartman2019-08-251-0/+2
| |\|
| * | Merge 4.9.168 into android-4.9-qGreg Kroah-Hartman2019-04-051-1/+0
| |\ \
* | \ \ Merge android-4.9.190 (476e7ea) into msm-4.9jianzhou2019-10-231-0/+2
|\ \ \ \
| * \ \ \ Merge 4.9.190 into android-4.9Greg Kroah-Hartman2019-08-251-0/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | netfilter: ctnetlink: don't use conntrack/expect object addresses as idFlorian Westphal2019-08-251-0/+2
| | | |/ | | |/|
* | | | Merge android-4.9.168 (286f971) into msm-4.9jianzhou2019-05-301-1/+0
|\| | |
| * | | Merge 4.9.168 into android-4.9Greg Kroah-Hartman2019-04-051-1/+0
| |\| | | | |/ | |/|
| | * netfilter: physdev: relax br_netfilter dependencyFlorian Westphal2019-04-051-1/+0
* | | Merge android-4.9.160 (fd5657a) into msm-4.9jianzhou2019-03-211-0/+29
|\| |
| * | Merge 4.9.159 into android-4.9Greg Kroah-Hartman2019-02-201-0/+29
| |\|
| | * netfilter: nf_tables: fix mismatch in big-endian systemLiping Zhang2019-02-201-0/+29
* | | Merge android-4.9.86 (b324a70) into msm-4.9Blagovest Kolenichev2018-04-171-1/+1
|\| |
| * | BACKPORT: treewide: Fix function prototypes for module_param_call()Kees Cook2018-02-281-1/+1
| |/
* | Merge remote-tracking branch '4.9/tmp-8cca21f' into 4.9Kyle Yan2017-11-292-2/+1
|\|
| * netfilter: nat: Revert "netfilter: nat: convert nat bysrc hash to rhashtable"Florian Westphal2017-11-182-3/+1
* | Merge "msm: netfilter: NATTYPE Refresh Timer Changes"Linux Build Service Account2017-11-271-1/+3
|\ \
| * | msm: netfilter: NATTYPE Refresh Timer ChangesMohammed Javid2017-11-261-1/+3
* | | netfilter: Changes to handle segmentation in SIP ALGMohammed Javid2017-11-242-0/+22
|/ /
* | msm: netfilter: NATTYPE Refresh Timer Changes.Niranjan Reddy Dumbala2017-11-222-0/+10
* | Merge "Merge remote-tracking branch '4.9/tmp-05a906d' into msm-4.9"Linux Build Service Account2017-10-241-2/+4
|\|
| * netfilter: nf_tables: set pktinfo->thoff at AH header if foundPablo Neira Ayuso2017-10-081-2/+4
* | net: Changes to support Shortcut Forward EngineMohammed Javid2017-10-242-0/+3
* | msm: net: Add support to packet threshold events.Mohammed Javid2017-10-161-0/+1
|/
* netfilter: nat: fix crash when conntrack entry is re-usedFlorian Westphal2016-11-241-3/+3
* netfilter: nf_tables: fix inconsistent element expiration calculationAnders K. Pedersen2016-11-241-1/+1
* netfilter: nat: switch to new rhlist interfaceFlorian Westphal2016-11-241-1/+1
* netfilter: conntrack: avoid excess memory allocationFlorian Westphal2016-10-271-2/+1
* netfilter: nf_tables: fix type mismatch with error return from nft_parse_u32_...John W. Linville2016-10-271-1/+1
* netfilter: nf_tables: fix *leak* when expr clone failLiping Zhang2016-10-271-2/+4
* netfilter: merge fixup for "nf_tables_netdev: remove redundant ip_hdr assignm...Stephen Rothwell2016-10-051-1/+0
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Pablo Neira Ayuso2016-09-253-0/+22
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-09-231-0/+14
| |\
| | * netfilter: synproxy: Check oom when adding synproxy and seqadj ct extensionsGao Feng2016-09-131-0/+14
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-09-122-0/+8
| |\|
| | * netfilter: nft_meta: improve the validity check of pkttype set exprLiping Zhang2016-08-251-0/+4
| | * netfilter: nft_reject: restrict to INPUT/FORWARD/OUTPUTLiping Zhang2016-08-251-0/+4
* | | netfilter: nft_log: complete NFTA_LOG_FLAGS attr supportLiping Zhang2016-09-251-8/+3
* | | netfilter: nf_tables: add range expressionPablo Neira Ayuso2016-09-251-0/+3
* | | netfilter: replace list_head with single linked listAaron Conole2016-09-251-2/+1
* | | netfilter: nf_queue: whitespace cleanupAaron Conole2016-09-251-4/+4
* | | netfilter: bridge: add and use br_nf_hook_threshFlorian Westphal2016-09-241-0/+6
* | | netfilter: nf_queue: improve queue range support for bridge familyLiping Zhang2016-09-231-13/+43
* | | netfilter: nf_tables: validate maximum value of u32 netlink attributesLaura Garcia Liebana2016-09-231-0/+1
* | | netfilter: nf_queue: get rid of dependency on IP6_NF_IPTABLESLiping Zhang2016-09-121-4/+0