summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorfrançois romieu <romieu@fr.zoreil.com>2009-03-15 01:09:54 +0000
committerDavid S. Miller <davem@davemloft.net>2009-03-15 20:03:10 -0700
commit97d477a914b146e7e6722ded21afa79886ae8ccd (patch)
tree94905bf4df5436c9bf4933901af8166dcad814f5 /drivers
parent682337fe062e939578d933c74157ae9a36baa4ce (diff)
downloadop-kernel-dev-97d477a914b146e7e6722ded21afa79886ae8ccd.zip
op-kernel-dev-97d477a914b146e7e6722ded21afa79886ae8ccd.tar.gz
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>
Diffstat (limited to 'drivers')
-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 b347340..352da2a 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)
opts1 |= FirstFrag;
} else {
len = skb->len;
-
- if (unlikely(len < ETH_ZLEN)) {
- if (skb_padto(skb, ETH_ZLEN))
- goto err_update_stats;
- len = ETH_ZLEN;
- }
-
opts1 |= FirstFrag | LastFrag;
tp->tx_skb[entry].skb = skb;
}
@@ -3407,7 +3400,6 @@ out:
err_stop:
netif_stop_queue(dev);
ret = NETDEV_TX_BUSY;
-err_update_stats:
dev->stats.tx_dropped++;
goto out;
}
OpenPOWER on IntegriCloud