From patchwork Fri Apr 26 23:49:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 240061 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.180.67]) by ozlabs.org (Postfix) with ESMTP id D6A922C00F8 for ; Sat, 27 Apr 2013 09:49:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755329Ab3DZXtq (ORCPT ); Fri, 26 Apr 2013 19:49:46 -0400 Received: from violet.fr.zoreil.com ([92.243.8.30]:47897 "EHLO violet.fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751480Ab3DZXtp (ORCPT ); Fri, 26 Apr 2013 19:49:45 -0400 Received: from violet.fr.zoreil.com (localhost [127.0.0.1]) by violet.fr.zoreil.com (8.14.5/8.14.5) with ESMTP id r3QNnXlp020408; Sat, 27 Apr 2013 01:49:33 +0200 Received: (from romieu@localhost) by violet.fr.zoreil.com (8.14.5/8.14.5/Submit) id r3QNnWsu020407; Sat, 27 Apr 2013 01:49:32 +0200 Date: Sat, 27 Apr 2013 01:49:32 +0200 From: Francois Romieu To: netdev@vger.kernel.org Cc: David Miller , Hayes Wang , Stefan Bader Subject: [PATCH net 1/1] r8169: fix 8168evl frame padding. Message-ID: <20130426234932.GA20296@electric-eye.fr.zoreil.com> MIME-Version: 1.0 Content-Disposition: inline X-Organisation: Land of Sunshine Inc. User-Agent: Mutt/1.5.21 (2010-09-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Stefan Bader Signed-off-by: Stefan Bader Acked-by: Francois Romieu Cc: hayeswang --- Stefan reported that Realtek's driver solves his problem as well. It works differently though: skb_checksum_help vs skb_pad here. drivers/net/ethernet/realtek/r8169.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 4ecbe64..15ba8c4 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -5787,6 +5787,14 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb, goto err_stop_0; } + /* 8168evl does not automatically pad to minimum length. */ + if (unlikely(tp->mac_version == RTL_GIGA_MAC_VER_34 && + skb->len < ETH_ZLEN)) { + if (skb_padto(skb, ETH_ZLEN)) + goto err_update_stats; + skb_put(skb, ETH_ZLEN - skb->len); + } + if (unlikely(le32_to_cpu(txd->opts1) & DescOwn)) goto err_stop_0; @@ -5858,6 +5866,7 @@ err_dma_1: rtl8169_unmap_tx_skb(d, tp->tx_skb + entry, txd); err_dma_0: dev_kfree_skb(skb); +err_update_stats: dev->stats.tx_dropped++; return NETDEV_TX_OK;