| From romieu@fr.zoreil.com Tue Apr 28 19:05:11 2009 |
| From: Francois Romieu <romieu@fr.zoreil.com> |
| Date: Thu, 16 Apr 2009 23:34:24 +0200 |
| Subject: r8169: use hardware auto-padding. |
| To: Greg KH <greg@kroah.com> |
| Message-ID: <20090416213424.GA26109@electric-eye.fr.zoreil.com> |
| Content-Disposition: inline |
| |
| From: Francois Romieu <romieu@fr.zoreil.com> |
| |
| Upstream as 97d477a914b146e7e6722ded21afa79886ae8ccd (post 2.6.28). |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/net/r8169.c | 8 -------- |
| 1 file changed, 8 deletions(-) |
| |
| --- a/drivers/net/r8169.c |
| +++ b/drivers/net/r8169.c |
| @@ -2549,13 +2549,6 @@ static int rtl8169_start_xmit(struct sk_ |
| 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; |
| } |
| @@ -2593,7 +2586,6 @@ out: |
| err_stop: |
| netif_stop_queue(dev); |
| ret = NETDEV_TX_BUSY; |
| -err_update_stats: |
| dev->stats.tx_dropped++; |
| goto out; |
| } |
