Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / net / gianfar.c

diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index b9f44602c5e14e640211425a1b2232a550504d58..b666a0cc064252691fa80877083e370428cf155d 100644 (file)
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -953,7 +953,7 @@ static inline void gfar_tx_checksum(struct sk_buff *skb, struct txfcb *fcb)
         * l4os is the distance between the start of the
         * l3 hdr and the l4 hdr */
        fcb->l3os = (u16)(skb_network_offset(skb) - GMAC_FCB_LEN);
-       fcb->l4os = (u16)(skb->h.raw - skb->nh.raw);
+       fcb->l4os = skb_network_header_len(skb);
 
        fcb->flags = flags;
 }