lkml.org 
[lkml]   [2013]   [May]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 27/73] r8169: fix 8168evl frame padding.
    Date
    3.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Stefan Bader <stefan.bader@canonical.com>

    commit e5195c1f31f399289347e043d6abf3ffa80f0005 upstream.

    Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
    Acked-by: Francois Romieu <romieu@fr.zoreil.com>
    Cc: hayeswang <hayeswang@realtek.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/net/ethernet/realtek/r8169.c | 9 +++++++++
    1 file changed, 9 insertions(+)

    --- a/drivers/net/ethernet/realtek/r8169.c
    +++ b/drivers/net/ethernet/realtek/r8169.c
    @@ -5779,6 +5779,14 @@ static netdev_tx_t rtl8169_start_xmit(st
    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;

    @@ -5850,6 +5858,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;




    \
     
     \ /
      Last update: 2013-05-10 01:21    [W:4.091 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site