Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/g…

…it/galak/powerpc into upstream-fixes
git-mirror · Jul 2, 2007 · c529e63 · c529e63
2 parents 36f9d0c + 8da32de
commit c529e63
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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.