Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f53f4137baedc1be179880d35f390e20445428ba
Commit:     f53f4137baedc1be179880d35f390e20445428ba
Parent:     9df7c98a0f7e0b7f4b547761ab64f39a13f20355
Author:     Al Viro <[EMAIL PROTECTED]>
AuthorDate: Sun Oct 14 19:41:09 2007 +0100
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Oct 14 12:41:52 2007 -0700

    fix endianness bug in inet_lro
    
    all uses of and almost all assignments to lro_desc->tcp_ack assume that it's
    net-endian; one converts net-endian to host-endian and sticks it in
    lro_desc->tcp_ack.
    
    Signed-off-by: Al Viro <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 include/linux/inet_lro.h |    2 +-
 net/ipv4/inet_lro.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/linux/inet_lro.h b/include/linux/inet_lro.h
index bb1c877..1246d46 100644
--- a/include/linux/inet_lro.h
+++ b/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/net/ipv4/inet_lro.c b/net/ipv4/inet_lro.c
index 7f22474..ac3b1d3 100644
--- a/net/ipv4/inet_lro.c
+++ b/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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to