Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c529e632 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

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

drivers/net/gianfar.c

+1 −1
Original line number Diff line number Diff line
@@ -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.