Commit c529e632 authored by Jeff Garzik's avatar Jeff Garzik

Merge branch 'for_linus' of...

Merge branch 'for_linus' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream-fixes
parents 36f9d0c5 8da32de5
...@@ -944,7 +944,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb) ...@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment