@@ -2816,7 +2816,31 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
hsize = len;
if (!hsize && i >= nfrags) {
- BUG_ON(fskb->len != len);
+ if (fskb->len != len) {
+ SKB_FRAG_ASSERT(fskb);
+
+ nskb = skb_segment(fskb, features);
+
+ err = PTR_ERR(nskb);
+ if (IS_ERR(nskb))
+ goto err;
+ err = -ENOMEM;
+
+ if (segs)
+ tail->next = nskb;
+ else
+ segs = nskb;
+
+ tail = nskb;
+ while (tail->next)
+ tail = tail->next;
+
+ BUG_ON(fskb->next && tail->len != len);
+
+ len = fskb->len;
+ fskb = fskb->next;
+ continue;
+ }
pos += len;
nskb = skb_clone(fskb, GFP_ATOMIC);