|
@@ -42,7 +42,8 @@ static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
padlen = (skb->len >= ETH_ZLEN) ? 0 : ETH_ZLEN - skb->len;
|
|
padlen = (skb->len >= ETH_ZLEN) ? 0 : ETH_ZLEN - skb->len;
|
|
|
|
|
|
if (skb_tailroom(skb) >= padlen + KSZ_INGRESS_TAG_LEN) {
|
|
if (skb_tailroom(skb) >= padlen + KSZ_INGRESS_TAG_LEN) {
|
|
- if (skb_put_padto(skb, skb->len + padlen))
|
|
|
|
|
|
+ /* Let dsa_slave_xmit() free skb */
|
|
|
|
+ if (__skb_put_padto(skb, skb->len + padlen, false))
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|
|
nskb = skb;
|
|
nskb = skb;
|
|
@@ -60,10 +61,11 @@ static struct sk_buff *ksz_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
skb_transport_header(skb) - skb->head);
|
|
skb_transport_header(skb) - skb->head);
|
|
skb_copy_and_csum_dev(skb, skb_put(nskb, skb->len));
|
|
skb_copy_and_csum_dev(skb, skb_put(nskb, skb->len));
|
|
|
|
|
|
- if (skb_put_padto(nskb, nskb->len + padlen)) {
|
|
|
|
- kfree_skb(nskb);
|
|
|
|
|
|
+ /* Let skb_put_padto() free nskb, and let dsa_slave_xmit() free
|
|
|
|
+ * skb
|
|
|
|
+ */
|
|
|
|
+ if (skb_put_padto(nskb, nskb->len + padlen))
|
|
return NULL;
|
|
return NULL;
|
|
- }
|
|
|
|
|
|
|
|
kfree_skb(skb);
|
|
kfree_skb(skb);
|
|
}
|
|
}
|