aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Herbert <therbert@google.com>2014-06-10 21:54:26 -0400
committerDavid S. Miller <davem@davemloft.net>2014-06-11 18:46:13 -0400
commit6bae1d4cc395ad46613e40c9e865ee171dc9de5c (patch)
tree9eac0e7a5cf38fd37f0cb364ffb6a3e90cce3c88
parent7e3cead5172927732f51fde77fef6f521e22f209 (diff)
net: Add skb_gro_postpull_rcsum to udp and vxlan
Need to gro_postpull_rcsum for GRO to work with checksum complete. Signed-off-by: Tom Herbert <therbert@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/vxlan.c2
-rw-r--r--net/ipv4/udp_offload.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 4e2caaf8b5da..1610d51dbb5c 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -565,6 +565,7 @@ static struct sk_buff **vxlan_gro_receive(struct sk_buff **head, struct sk_buff
565 goto out; 565 goto out;
566 } 566 }
567 skb_gro_pull(skb, sizeof(struct vxlanhdr)); /* pull vxlan header */ 567 skb_gro_pull(skb, sizeof(struct vxlanhdr)); /* pull vxlan header */
568 skb_gro_postpull_rcsum(skb, vh, sizeof(struct vxlanhdr));
568 569
569 off_eth = skb_gro_offset(skb); 570 off_eth = skb_gro_offset(skb);
570 hlen = off_eth + sizeof(*eh); 571 hlen = off_eth + sizeof(*eh);
@@ -599,6 +600,7 @@ static struct sk_buff **vxlan_gro_receive(struct sk_buff **head, struct sk_buff
599 } 600 }
600 601
601 skb_gro_pull(skb, sizeof(*eh)); /* pull inner eth header */ 602 skb_gro_pull(skb, sizeof(*eh)); /* pull inner eth header */
603 skb_gro_postpull_rcsum(skb, eh, sizeof(*eh));
602 pp = ptype->callbacks.gro_receive(head, skb); 604 pp = ptype->callbacks.gro_receive(head, skb);
603 605
604out_unlock: 606out_unlock:
diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c
index 7b1840110173..546d2d439dda 100644
--- a/net/ipv4/udp_offload.c
+++ b/net/ipv4/udp_offload.c
@@ -200,6 +200,7 @@ unflush:
200 } 200 }
201 201
202 skb_gro_pull(skb, sizeof(struct udphdr)); /* pull encapsulating udp header */ 202 skb_gro_pull(skb, sizeof(struct udphdr)); /* pull encapsulating udp header */
203 skb_gro_postpull_rcsum(skb, uh, sizeof(struct udphdr));
203 pp = uo_priv->offload->callbacks.gro_receive(head, skb); 204 pp = uo_priv->offload->callbacks.gro_receive(head, skb);
204 205
205out_unlock: 206out_unlock: