summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-03-24 16:38:53 -0700
committerDavid S. Miller <davem@davemloft.net>2009-03-24 16:38:53 -0700
commitc80dd2da736ba235c2ca5dcaa00aac6907786c5b (patch)
treed47d94305e17ca6e2b2e7462593241dc7984b317 /net
parent142071b83426674ef2dab98cf2a6627328d0988e (diff)
parent534f81a5068799799e264fd162e9488a129f98d4 (diff)
downloadop-kernel-dev-c80dd2da736ba235c2ca5dcaa00aac6907786c5b.zip
op-kernel-dev-c80dd2da736ba235c2ca5dcaa00aac6907786c5b.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/nf_conntrack_proto_tcp.c3
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 f3fd154..56ac4ee 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>
@@ -466,7 +467,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;
OpenPOWER on IntegriCloud