aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-12-03 01:04:50 -0500
committerDavid S. Miller <davem@davemloft.net>2006-12-03 01:04:50 -0500
commitf9aae95828d3478520f4bd73221bcb450ec1a5c0 (patch)
tree642e3e4b2625e476a1e31fe2e9aebd05a1e20417 /include
parent0c4ca1bd8638d04796553b6e678063c4fadb92cc (diff)
[NETFILTER]: nf_conntrack: fix helper structure alignment
Adding the alignment to the size doesn't make any sense, what it should do is align the size of the conntrack structure to the alignment requirements of the helper structure and return an aligned pointer in nfct_help(). Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/net/netfilter/nf_conntrack.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h
index d0d0e6491448..b4beb8c799e5 100644
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -273,6 +273,7 @@ static inline struct nf_conn_help *nfct_help(const struct nf_conn *ct)
273 if (!(ct->features & NF_CT_F_HELP)) 273 if (!(ct->features & NF_CT_F_HELP))
274 return NULL; 274 return NULL;
275 275
276 offset = ALIGN(offset, __alignof__(struct nf_conn_help));
276 return (struct nf_conn_help *) ((void *)ct + offset); 277 return (struct nf_conn_help *) ((void *)ct + offset);
277} 278}
278 279