On Sat, May 04, 2013 at 12:23:24PM +0200, Francois Romieu wrote:
> From: Stefan Bader <stefan.bader@xxxxxxxxxxxxx>
>
> commit e5195c1f31f399289347e043d6abf3ffa80f0005 upstream.
Thanks, I'm queuing it for the 3.5.y kernel.
Cheers,
--
Luis
>
> Signed-off-by: Stefan Bader <stefan.bader@xxxxxxxxxxxxx> Acked-by:
> Francois Romieu <romieu@xxxxxxxxxxxxx> Cc: hayeswang
> <hayeswang@xxxxxxxxxxx> Signed-off-by: David S. Miller
> <davem@xxxxxxxxxxxxx> --- 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 a32d221..de68de3 100644
> --- a/drivers/net/ethernet/realtek/r8169.c
> +++ b/drivers/net/ethernet/realtek/r8169.c
> @@ -5530,6 +5530,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;
>
> @@ -5601,6 +5609,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;
>
> --
> 1.8.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html