[TCP]: Introduce tcp_hdrlen() and tcp_optlen()

[net-next-2.6.git] / drivers / net / myri10ge / myri10ge.c

diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index e04228c7b14f32a9bf8a35d2fb844a58dcde7a38..e4b69a0485baabc6e0e06cefe209b44c7d83c61c 100644 (file)
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2054,8 +2054,7 @@ again:
                 * send loop that we are still in the
                 * header portion of the TSO packet.
                 * TSO header must be at most 134 bytes long */
-               cum_len = -(skb_transport_offset(skb) +
-                           (skb->h.th->doff << 2));
+               cum_len = -(skb_transport_offset(skb) + tcp_hdrlen(skb));
 
                /* for TSO, pseudo_hdr_offset holds mss.
                 * The firmware figures out where to put