net: add skb_[inner_]tcp_all_headers helpers

[linux-2.6-block.git] / drivers / net / ethernet / intel / e1000e / netdev.c

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index fa06f68c8c8038c5355ff605f3854703259a739b..38e60def852070f39fc22bb1885157e016ecbea6 100644 (file)
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5474,7 +5474,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb,
        if (err < 0)
                return err;
 
-       hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+       hdr_len = skb_tcp_all_headers(skb);
        mss = skb_shinfo(skb)->gso_size;
        if (protocol == htons(ETH_P_IP)) {
                struct iphdr *iph = ip_hdr(skb);
@@ -5846,7 +5846,7 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb,
                 * points to just header, pull a few bytes of payload from
                 * frags into skb->data
                 */
-               hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb);
+               hdr_len = skb_tcp_all_headers(skb);
                /* we do this workaround for ES2LAN, but it is un-necessary,
                 * avoiding it could save a lot of cycles
                 */