diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-12-02 22:04:50 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-12-02 22:04:50 -0800 |
| commit | f9aae95828d3478520f4bd73221bcb450ec1a5c0 (patch) | |
| tree | 642e3e4b2625e476a1e31fe2e9aebd05a1e20417 /include | |
| parent | 0c4ca1bd8638d04796553b6e678063c4fadb92cc (diff) | |
| download | kernel_samsung_aries-f9aae95828d3478520f4bd73221bcb450ec1a5c0.zip kernel_samsung_aries-f9aae95828d3478520f4bd73221bcb450ec1a5c0.tar.gz kernel_samsung_aries-f9aae95828d3478520f4bd73221bcb450ec1a5c0.tar.bz2 | |
[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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/net/netfilter/nf_conntrack.h b/include/net/netfilter/nf_conntrack.h index d0d0e64..b4beb8c 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) if (!(ct->features & NF_CT_F_HELP)) return NULL; + offset = ALIGN(offset, __alignof__(struct nf_conn_help)); return (struct nf_conn_help *) ((void *)ct + offset); } |