From patchwork Sun Mar 15 11:09:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 24469 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id E58CADE088 for ; Sun, 15 Mar 2009 22:07:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753284AbZCOLHH (ORCPT ); Sun, 15 Mar 2009 07:07:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753862AbZCOLHG (ORCPT ); Sun, 15 Mar 2009 07:07:06 -0400 Received: from electric-eye.fr.zoreil.com ([213.41.134.224]:52201 "EHLO electric-eye.fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753027AbZCOLHF (ORCPT ); Sun, 15 Mar 2009 07:07:05 -0400 Received: from electric-eye.fr.zoreil.com (localhost.localdomain [127.0.0.1]) by electric-eye.fr.zoreil.com (8.14.2/8.14.1) with ESMTP id n2FB9vCK018143; Sun, 15 Mar 2009 12:09:57 +0100 Received: (from romieu@localhost) by electric-eye.fr.zoreil.com (8.14.2/8.14.2/Submit) id n2FB9sBM018142; Sun, 15 Mar 2009 12:09:54 +0100 Date: Sun, 15 Mar 2009 12:09:54 +0100 From: Francois Romieu To: "David S. Miller" Cc: Dave Jones , Mikael Pettersson , Tim Durack , ivecera@redhat.com, netdev@vger.kernel.org Subject: [PATCH 1/2] r8169: use hardware auto-padding. Message-ID: <20090315110954.GA17800@electric-eye.fr.zoreil.com> MIME-Version: 1.0 Content-Disposition: inline X-Organisation: Land of Sunshine Inc. User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org It shortens the code and fixes the current pci_unmap leak with padded skb reported by Dave Jones. Signed-off-by: Francois Romieu --- drivers/net/r8169.c | 8 -------- 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; }