diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-26 11:22:01 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-26 11:22:01 +0300 |
commit | f0de70f8bb56952f6e016a65a8a8d006918f5bf6 (patch) | |
tree | 1d38f828b212adc0a0f2d100d58544979fab543d /net/netfilter | |
parent | bb3daa4a5960cd9d39bad88679fcf587b456c05d (diff) | |
parent | cda6d377ec6b2ee2e58d563d0bd7eb313e0165df (diff) | |
download | linux-f0de70f8bb56952f6e016a65a8a8d006918f5bf6.tar.xz |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/nf_conntrack_proto_tcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index e46f3b79adb3..0aeb8b09a1f7 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c @@ -15,6 +15,7 @@ #include <linux/skbuff.h> #include <linux/ipv6.h> #include <net/ip6_checksum.h> +#include <asm/unaligned.h> #include <net/tcp.h> @@ -468,7 +469,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) { - tmp = ntohl(*((__be32 *)(ptr+i)+1)); + tmp = get_unaligned_be32((__be32 *)(ptr+i)+1); if (after(tmp, *sack)) *sack = tmp; |