Please pull from 'from_linus' branch

[Kumar Gala]

Please pull from 'for_linus' branch of

	master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc.git for_linus

to receive the following updates:

 drivers/net/gianfar.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Kumar Gala (1):
      gianfar: Fix typo bug introduced by move to udp_hdr()

commit 8da32de5c845b711a500f89342baf10c662e2ecb
Author: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>
Date:   Fri Jun 29 00:12:04 2007 -0500

    gianfar: Fix typo bug introduced by move to udp_hdr()

    In commit 4bedb45203eab92a87b4c863fe2d0cded633427f both the udp and tcp
    cases where changed to use udp_hdr() instead of leaving the tcp case
    alone and fixing with tcp_hdr().

    This ended up causing random behavior with TCP connections because
    of looking for tcp_hdr()->check in the wrong place.

    Signed-off-by: Kumar Gala <galak@xxxxxxxxxxxxxxxxxxx>

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 6822bf1..1b854bf 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -944,7 +944,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
 		flags |= TXFCB_UDP;
 		fcb->phcs = udp_hdr(skb)->check;
 	} else
-		fcb->phcs = udp_hdr(skb)->check;
+		fcb->phcs = tcp_hdr(skb)->check;

 	/* l3os is the distance between the start of the
 	 * frame (skb->data) and the start of the IP hdr.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/