aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/r8169.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/r8169.c')
-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 0771eb6fc6eb..43fedb9ecedb 100644
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -3253,13 +3253,6 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
3253 opts1 |= FirstFrag; 3253 opts1 |= FirstFrag;
3254 } else { 3254 } else {
3255 len = skb->len; 3255 len = skb->len;
3256
3257 if (unlikely(len < ETH_ZLEN)) {
3258 if (skb_padto(skb, ETH_ZLEN))
3259 goto err_update_stats;
3260 len = ETH_ZLEN;
3261 }
3262
3263 opts1 |= FirstFrag | LastFrag; 3256 opts1 |= FirstFrag | LastFrag;
3264 tp->tx_skb[entry].skb = skb; 3257 tp->tx_skb[entry].skb = skb;
3265 } 3258 }
@@ -3297,7 +3290,6 @@ out:
3297err_stop: 3290err_stop:
3298 netif_stop_queue(dev); 3291 netif_stop_queue(dev);
3299 ret = NETDEV_TX_BUSY; 3292 ret = NETDEV_TX_BUSY;
3300err_update_stats:
3301 dev->stats.tx_dropped++; 3293 dev->stats.tx_dropped++;
3302 goto out; 3294 goto out;
3303} 3295}