浏览代码

r8169: use hardware auto-padding.

It shortens the code and fixes the current pci_unmap leak with
padded skb reported by Dave Jones.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
françois romieu 16 年之前
父节点
当前提交
97d477a914
共有 1 个文件被更改,包括 0 次插入8 次删除
  1. 0 8
      drivers/net/r8169.c

+ 0 - 8
drivers/net/r8169.c

@@ -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;
 }
 }