diff options
| author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-03-07 00:21:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 01:23:59 -0400 |
| commit | 8f05ce91c8b801af106611ad83b1d8d7429b9b46 (patch) | |
| tree | 7fdf8adfbba7ddca8dabe51be5a70c47ee8adfc0 | |
| parent | 4412ec494868160d57da6e436a92b0696f40b19d (diff) | |
[NET] NETFILTER: Use htonl() where appropriate.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/netfilter/nf_conntrack_proto_tcp.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index 153d6619993a..9e496319f606 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c | |||
| @@ -470,11 +470,10 @@ static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff, | |||
| 470 | 470 | ||
| 471 | /* Fast path for timestamp-only option */ | 471 | /* Fast path for timestamp-only option */ |
| 472 | if (length == TCPOLEN_TSTAMP_ALIGNED*4 | 472 | if (length == TCPOLEN_TSTAMP_ALIGNED*4 |
| 473 | && *(__be32 *)ptr == | 473 | && *(__be32 *)ptr == htonl((TCPOPT_NOP << 24) |
| 474 | __constant_htonl((TCPOPT_NOP << 24) | 474 | | (TCPOPT_NOP << 16) |
| 475 | | (TCPOPT_NOP << 16) | 475 | | (TCPOPT_TIMESTAMP << 8) |
| 476 | | (TCPOPT_TIMESTAMP << 8) | 476 | | TCPOLEN_TIMESTAMP)) |
| 477 | | TCPOLEN_TIMESTAMP)) | ||
| 478 | return; | 477 | return; |
| 479 | 478 | ||
| 480 | while (length > 0) { | 479 | while (length > 0) { |