This is a note to let you know that I've just added the patch titled

    r8169: fix 8168evl frame padding.

to the 3.9-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     r8169-fix-8168evl-frame-padding.patch
and it can be found in the queue-3.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.


>From e5195c1f31f399289347e043d6abf3ffa80f0005 Mon Sep 17 00:00:00 2001
From: Stefan Bader <[email protected]>
Date: Fri, 26 Apr 2013 13:49:32 +0000
Subject: r8169: fix 8168evl frame padding.

From: Stefan Bader <[email protected]>

commit e5195c1f31f399289347e043d6abf3ffa80f0005 upstream.

Signed-off-by: Stefan Bader <[email protected]>
Acked-by: Francois Romieu <[email protected]>
Cc: hayeswang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

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


Patches currently in stable-queue which might be from 
[email protected] are

queue-3.9/r8169-fix-8168evl-frame-padding.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to