diff options
Diffstat (limited to 'drivers/net/loopback.c')
-rw-r--r-- | drivers/net/loopback.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index af476d2a513d..9265c27b13b2 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c | |||
@@ -76,7 +76,8 @@ static DEFINE_PER_CPU(struct pcpu_lstats, pcpu_lstats); | |||
76 | static void emulate_large_send_offload(struct sk_buff *skb) | 76 | static void emulate_large_send_offload(struct sk_buff *skb) |
77 | { | 77 | { |
78 | struct iphdr *iph = skb->nh.iph; | 78 | struct iphdr *iph = skb->nh.iph; |
79 | struct tcphdr *th = (struct tcphdr*)(skb->nh.raw + (iph->ihl * 4)); | 79 | struct tcphdr *th = (struct tcphdr *)(skb_network_header(skb) + |
80 | (iph->ihl * 4)); | ||
80 | unsigned int doffset = (iph->ihl + th->doff) * 4; | 81 | unsigned int doffset = (iph->ihl + th->doff) * 4; |
81 | unsigned int mtu = skb_shinfo(skb)->gso_size + doffset; | 82 | unsigned int mtu = skb_shinfo(skb)->gso_size + doffset; |
82 | unsigned int offset = 0; | 83 | unsigned int offset = 0; |
@@ -93,7 +94,7 @@ static void emulate_large_send_offload(struct sk_buff *skb) | |||
93 | skb_set_mac_header(nskb, -ETH_HLEN); | 94 | skb_set_mac_header(nskb, -ETH_HLEN); |
94 | skb_reset_network_header(nskb); | 95 | skb_reset_network_header(nskb); |
95 | iph = nskb->nh.iph; | 96 | iph = nskb->nh.iph; |
96 | memcpy(nskb->data, skb->nh.raw, doffset); | 97 | memcpy(nskb->data, skb_network_header(skb), doffset); |
97 | if (skb_copy_bits(skb, | 98 | if (skb_copy_bits(skb, |
98 | doffset + offset, | 99 | doffset + offset, |
99 | nskb->data + doffset, | 100 | nskb->data + doffset, |
@@ -108,7 +109,7 @@ static void emulate_large_send_offload(struct sk_buff *skb) | |||
108 | memcpy(nskb->cb, skb->cb, sizeof(skb->cb)); | 109 | memcpy(nskb->cb, skb->cb, sizeof(skb->cb)); |
109 | nskb->pkt_type = skb->pkt_type; | 110 | nskb->pkt_type = skb->pkt_type; |
110 | 111 | ||
111 | th = (struct tcphdr*)(nskb->nh.raw + iph->ihl*4); | 112 | th = (struct tcphdr *)(skb_network_header(nskb) + iph->ihl * 4); |
112 | iph->tot_len = htons(frag_size + doffset); | 113 | iph->tot_len = htons(frag_size + doffset); |
113 | iph->id = htons(id); | 114 | iph->id = htons(id); |
114 | iph->check = 0; | 115 | iph->check = 0; |