Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
net
/
ipv4
/
gre_offload.c
diff --git
a/kernel/net/ipv4/gre_offload.c
b/kernel/net/ipv4/gre_offload.c
index
5a8ee32
..
79ae0d7
100644
(file)
--- a/
kernel/net/ipv4/gre_offload.c
+++ b/
kernel/net/ipv4/gre_offload.c
@@
-128,6
+128,11
@@
static struct sk_buff **gre_gro_receive(struct sk_buff **head,
struct packet_offload *ptype;
__be16 type;
struct packet_offload *ptype;
__be16 type;
+ if (NAPI_GRO_CB(skb)->encap_mark)
+ goto out;
+
+ NAPI_GRO_CB(skb)->encap_mark = 1;
+
off = skb_gro_offset(skb);
hlen = off + sizeof(*greh);
greh = skb_gro_header_fast(skb, off);
off = skb_gro_offset(skb);
hlen = off + sizeof(*greh);
greh = skb_gro_header_fast(skb, off);
@@
-214,7
+219,7
@@
static struct sk_buff **gre_gro_receive(struct sk_buff **head,
/* Adjusted NAPI_GRO_CB(skb)->csum after skb_gro_pull()*/
skb_gro_postpull_rcsum(skb, greh, grehlen);
/* Adjusted NAPI_GRO_CB(skb)->csum after skb_gro_pull()*/
skb_gro_postpull_rcsum(skb, greh, grehlen);
- pp =
ptype->callbacks.gro_receive(
head, skb);
+ pp =
call_gro_receive(ptype->callbacks.gro_receive,
head, skb);
out_unlock:
rcu_read_unlock();
out_unlock:
rcu_read_unlock();