|
@@ -3076,7 +3076,7 @@ int skb_gro_receive(struct sk_buff **head, struct sk_buff *skb)
|
|
|
if (unlikely(p->len + len >= 65536))
|
|
|
return -E2BIG;
|
|
|
|
|
|
- lp = NAPI_GRO_CB(p)->last ?: p;
|
|
|
+ lp = NAPI_GRO_CB(p)->last;
|
|
|
pinfo = skb_shinfo(lp);
|
|
|
|
|
|
if (headlen <= offset) {
|
|
@@ -3192,7 +3192,7 @@ merge:
|
|
|
|
|
|
__skb_pull(skb, offset);
|
|
|
|
|
|
- if (!NAPI_GRO_CB(p)->last)
|
|
|
+ if (NAPI_GRO_CB(p)->last == p)
|
|
|
skb_shinfo(p)->frag_list = skb;
|
|
|
else
|
|
|
NAPI_GRO_CB(p)->last->next = skb;
|