projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tipc: fix bug in link failover handling
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
udp_offload.c
diff --git
a/net/ipv4/udp_offload.c
b/net/ipv4/udp_offload.c
index d10f6f4ead27918c3e7c31b754ec977518791d70..4915d8284a86f9ec6e5536804b24398d205e2a2b 100644
(file)
--- a/
net/ipv4/udp_offload.c
+++ b/
net/ipv4/udp_offload.c
@@
-402,6
+402,13
@@
int udp_gro_complete(struct sk_buff *skb, int nhoff)
}
rcu_read_unlock();
}
rcu_read_unlock();
+
+ if (skb->remcsum_offload)
+ skb_shinfo(skb)->gso_type |= SKB_GSO_TUNNEL_REMCSUM;
+
+ skb->encapsulation = 1;
+ skb_set_inner_mac_header(skb, nhoff + sizeof(struct udphdr));
+
return err;
}
return err;
}
@@
-410,9
+417,13
@@
static int udp4_gro_complete(struct sk_buff *skb, int nhoff)
const struct iphdr *iph = ip_hdr(skb);
struct udphdr *uh = (struct udphdr *)(skb->data + nhoff);
const struct iphdr *iph = ip_hdr(skb);
struct udphdr *uh = (struct udphdr *)(skb->data + nhoff);
- if (uh->check)
+ if (uh->check) {
+ skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL_CSUM;
uh->check = ~udp_v4_check(skb->len - nhoff, iph->saddr,
iph->daddr, 0);
uh->check = ~udp_v4_check(skb->len - nhoff, iph->saddr,
iph->daddr, 0);
+ } else {
+ skb_shinfo(skb)->gso_type |= SKB_GSO_UDP_TUNNEL;
+ }
return udp_gro_complete(skb, nhoff);
}
return udp_gro_complete(skb, nhoff);
}