Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c80dd2da authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

parents 142071b8 534f81a5

net/netfilter/nf_conntrack_proto_tcp.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/skbuff.h>

#include <linux/skbuff.h>

#include <linux/ipv6.h>

#include <linux/ipv6.h>

#include <net/ip6_checksum.h>

#include <net/ip6_checksum.h>

#include <asm/unaligned.h>





#include <net/tcp.h>

#include <net/tcp.h>
@@ -466,7 +467,7 @@ static void tcp_sack(const struct sk_buff *skb, unsigned int dataoff, 
				for (i = 0;

				for (i = 0;

				     i < (opsize - TCPOLEN_SACK_BASE);

				     i < (opsize - TCPOLEN_SACK_BASE);

				     i += TCPOLEN_SACK_PERBLOCK) {

				     i += TCPOLEN_SACK_PERBLOCK) {

					tmp = ntohl(*((__be32 *)(ptr+i)+1));

					tmp = get_unaligned_be32((__be32 *)(ptr+i)+1);





					if (after(tmp, *sack))

					if (after(tmp, *sack))

						*sack = tmp;

						*sack = tmp;