Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / s390 / net / qeth_tso.h

diff --git a/drivers/s390/net/qeth_tso.h b/drivers/s390/net/qeth_tso.h
index 255cb2e9c7965f40ca1042167459301d43923c96..c20e923cf9ad0ff2ac7cd82d450350e43655e8aa 100644 (file)
--- a/drivers/s390/net/qeth_tso.h
+++ b/drivers/s390/net/qeth_tso.h
@@ -41,7 +41,7 @@ qeth_tso_fill_header(struct qeth_card *card, struct sk_buff *skb)
 
        hdr  = (struct qeth_hdr_tso *) skb->data;
        iph  = ip_hdr(skb);
-       tcph = skb->h.th;
+       tcph = tcp_hdr(skb);
        /*fix header to TSO values ...*/
        hdr->hdr.hdr.l3.id = QETH_HEADER_TYPE_TSO;
        /*set values which are fix for the first approach ...*/
@@ -64,8 +64,8 @@ static inline void
 qeth_tso_set_tcpip_header(struct qeth_card *card, struct sk_buff *skb)
 {
        struct iphdr *iph    = ip_hdr(skb);
-       struct ipv6hdr *ip6h = skb->nh.ipv6h;
-       struct tcphdr *tcph  = skb->h.th;
+       struct ipv6hdr *ip6h = ipv6_hdr(skb);
+       struct tcphdr *tcph  = tcp_hdr(skb);
 
        tcph->check = 0;
        if (skb->protocol == ETH_P_IPV6) {