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

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

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 76a31afe20deefb922d1284328da089273b6dc65..7ca30d76bf6f08bb62a7cdb9546ec38f81021c8f 100644 (file)
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -3911,7 +3911,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
                else {
                        struct iphdr *iph = ip_hdr(skb);
 
-                       tcp_opt_len = ((skb->h.th->doff - 5) * 4);
+                       tcp_opt_len = tcp_optlen(skb);
                        ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);
 
                        iph->check = 0;
@@ -4065,7 +4065,7 @@ static int tg3_start_xmit_dma_bug(struct sk_buff *skb, struct net_device *dev)
                        goto out_unlock;
                }
 
-               tcp_opt_len = ((skb->h.th->doff - 5) * 4);
+               tcp_opt_len = tcp_optlen(skb);
                ip_tcp_len = ip_hdrlen(skb) + sizeof(struct tcphdr);
 
                hdr_len = ip_tcp_len + tcp_opt_len;