---

yaml --- r: 68698 b: refs/heads/master c: f53f413 h: refs/heads/master v: v3
git-mirror · Oct 14, 2007 · ac3ad7f · ac3ad7f
1 parent 36ce7b9
commit ac3ad7f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9df7c98a0f7e0b7f4b547761ab64f39a13f20355
+refs/heads/master: f53f4137baedc1be179880d35f390e20445428ba
diff --git a/trunk/include/linux/inet_lro.h b/trunk/include/linux/inet_lro.h
@@ -54,7 +54,7 @@ struct net_lro_desc {
 	__wsum  data_csum;
 	__be32 tcp_rcv_tsecr;
 	__be32 tcp_rcv_tsval;
-	u32 tcp_ack;
+	__be32 tcp_ack;
 	u32 tcp_next_seq;
 	u32 skb_tot_frags_len;
 	u16 ip_tot_len;

diff --git a/trunk/net/ipv4/inet_lro.c b/trunk/net/ipv4/inet_lro.c
@@ -159,7 +159,7 @@ static void lro_init_desc(struct net_lro_desc *lro_desc, struct sk_buff *skb,
 	lro_desc->iph = iph;
 	lro_desc->tcph = tcph;
 	lro_desc->tcp_next_seq = ntohl(tcph->seq) + tcp_data_len;
-	lro_desc->tcp_ack = ntohl(tcph->ack_seq);
+	lro_desc->tcp_ack = tcph->ack_seq;
 	lro_desc->tcp_window = tcph->window;
 
 	lro_desc->pkt_aggr_cnt = 1;