From cea206c94f02e69c3148c6b2267370c36e530852 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 9 Feb 2017 11:17:02 +0100 Subject: make: Fix spelling yaac -> yacc The parser generator's name is yacc, not yaac. Signed-off-by: Tobias Klauser --- bpfc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bpfc') diff --git a/bpfc/Makefile b/bpfc/Makefile index 7e6fd45..d550c8f 100644 --- a/bpfc/Makefile +++ b/bpfc/Makefile @@ -13,7 +13,7 @@ bpfc-objs = xmalloc.o \ bpfc-lex = bpf_lexer.yy.o -bpfc-yaac = bpf_parser.tab.o +bpfc-yacc = bpf_parser.tab.o bpfc-eflags = -I.. -- cgit v1.2.3-54-g00ecf Git repository'/>
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2017-01-23 18:21:58 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2017-02-02 14:31:55 +0100
commit303223092081963513494b4377fa1ac9e362ed4b (patch)
treee312cf241ada3f96d5844613770ebbeeb152585c
parentc74454fadd5ea6fc866ffe2c417a0dba56b2bf1c (diff)
netfilter: guarantee 8 byte minalign for template addresses
The next change will merge skb->nfct pointer and skb->nfctinfo status bits into single skb->_nfct (unsigned long) area. For this to work nf_conn addresses must always be aligned at least on an 8 byte boundary since we will need the lower 3bits to store nfctinfo. Conntrack templates are allocated via kmalloc. kbuild test robot reported BUILD_BUG_ON failed: NFCT_INFOMASK >= ARCH_KMALLOC_MINALIGN on v1 of this patchset, so not all platforms meet this requirement. Do manual alignment if needed, the alignment offset is stored in the nf_conn entry protocol area. This works because templates are not handed off to L4 protocol trackers. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat
-rw-r--r--include/net/netfilter/nf_conntrack.h2
-rw-r--r--net/netfilter/nf_conntrack_core.c29
2 files changed, 26 insertions, 5 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h