Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream-fixes

This commit is contained in:
Jeff Garzik
2007-07-02 08:15:33 -04:00

View File

@@ -944,7 +944,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
flags |= TXFCB_UDP; flags |= TXFCB_UDP;
fcb->phcs = udp_hdr(skb)->check; fcb->phcs = udp_hdr(skb)->check;
} else } else
fcb->phcs = udp_hdr(skb)->check; fcb->phcs = tcp_hdr(skb)->check;
/* l3os is the distance between the start of the /* l3os is the distance between the start of the
* frame (skb->data) and the start of the IP hdr. * frame (skb->data) and the start of the IP hdr.