diff options
| author |   Patrick McHardy <kaber@trash.net> | 2006-12-02 22:05:08 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2006-12-02 22:05:08 -0800 |
| commit | bff9a89bcac5b68ac0a1ea856b1726a35ae1eabb (patch) | |
| tree | 188356d5411849c8d7b1a36dcb3223373a0bbb68 /net/netfilter/nf_conntrack_proto_tcp.c | |
| parent | [NETFILTER]: nf_conntrack: fix helper structure alignment (diff) | |
| download | linux-dev-bff9a89bcac5b68ac0a1ea856b1726a35ae1eabb.tar.xz linux-dev-bff9a89bcac5b68ac0a1ea856b1726a35ae1eabb.zip | |
[NETFILTER]: nf_conntrack: endian annotations
Resync with Al Viro's ip_conntrack annotations and fix a missed
spot in ip_nat_proto_icmp.c.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_tcp.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index d99c7c4176d4..71f492fc6413 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -474,8 +474,8 @@ static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff, /* Fast path for timestamp-only option */ if (length == TCPOLEN_TSTAMP_ALIGNED*4 - && *(__u32 *)ptr == - __constant_ntohl((TCPOPT_NOP << 24) + && *(__be32 *)ptr == + __constant_htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) | (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP)) @@ -506,9 +506,7 @@ static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff, for (i = 0; i < (opsize - TCPOLEN_SACK_BASE); i += TCPOLEN_SACK_PERBLOCK) { - memcpy(&tmp, (__u32 *)(ptr + i) + 1, - sizeof(__u32)); - tmp = ntohl(tmp); + tmp = ntohl(*((__be32 *)(ptr+i)+1)); if (after(tmp, *sack)) *sack = tmp; |