|
@@ -3363,13 +3363,6 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
|
|
opts1 |= FirstFrag;
|
|
opts1 |= FirstFrag;
|
|
} else {
|
|
} else {
|
|
len = skb->len;
|
|
len = skb->len;
|
|
-
|
|
|
|
- if (unlikely(len < ETH_ZLEN)) {
|
|
|
|
- if (skb_padto(skb, ETH_ZLEN))
|
|
|
|
- goto err_update_stats;
|
|
|
|
- len = ETH_ZLEN;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
opts1 |= FirstFrag | LastFrag;
|
|
opts1 |= FirstFrag | LastFrag;
|
|
tp->tx_skb[entry].skb = skb;
|
|
tp->tx_skb[entry].skb = skb;
|
|
}
|
|
}
|
|
@@ -3407,7 +3400,6 @@ out:
|
|
err_stop:
|
|
err_stop:
|
|
netif_stop_queue(dev);
|
|
netif_stop_queue(dev);
|
|
ret = NETDEV_TX_BUSY;
|
|
ret = NETDEV_TX_BUSY;
|
|
-err_update_stats:
|
|
|
|
dev->stats.tx_dropped++;
|
|
dev->stats.tx_dropped++;
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|