aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/r8169.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
index b3473401c83a..352da2a43c9f 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3363,13 +3363,6 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
3363 opts1 |= FirstFrag; 3363 opts1 |= FirstFrag;
3364 } else { 3364 } else {
3365 len = skb->len; 3365 len = skb->len;
3366
3367 if (unlikely(len < ETH_ZLEN)) {
3368 if (skb_padto(skb, ETH_ZLEN))
3369 goto err_update_stats;
3370 len = ETH_ZLEN;
3371 }
3372
3373 opts1 |= FirstFrag | LastFrag; 3366 opts1 |= FirstFrag | LastFrag;
3374 tp->tx_skb[entry].skb = skb; 3367 tp->tx_skb[entry].skb = skb;
3375 } 3368 }
@@ -3407,7 +3400,6 @@ out:
3407err_stop: 3400err_stop:
3408 netif_stop_queue(dev); 3401 netif_stop_queue(dev);
3409 ret = NETDEV_TX_BUSY; 3402 ret = NETDEV_TX_BUSY;
3410err_update_stats:
3411 dev->stats.tx_dropped++; 3403 dev->stats.tx_dropped++;
3412 goto out; 3404 goto out;
3413} 3405}