From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 8 May 2013 23:02:19 +0000 (-0700)
Subject: 3.8-stable patches
X-Git-Tag: v3.9.2~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd360ba0e78e41216c0d86e4be22bcee8b06af81;p=thirdparty%2Fkernel%2Fstable-queue.git

3.8-stable patches

added patches:
	r8169-fix-8168evl-frame-padding.patch
---

diff --git a/queue-3.8/r8169-fix-8168evl-frame-padding.patch b/queue-3.8/r8169-fix-8168evl-frame-padding.patch
new file mode 100644
index 00000000000..395a4289214
--- /dev/null
+++ b/queue-3.8/r8169-fix-8168evl-frame-padding.patch
@@ -0,0 +1,44 @@
+From e5195c1f31f399289347e043d6abf3ffa80f0005 Mon Sep 17 00:00:00 2001
+From: Stefan Bader <stefan.bader@canonical.com>
+Date: Fri, 26 Apr 2013 13:49:32 +0000
+Subject: r8169: fix 8168evl frame padding.
+
+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;
+ 
diff --git a/queue-3.8/series b/queue-3.8/series
index af5a88e93e4..f654fd5a58b 100644
--- a/queue-3.8/series
+++ b/queue-3.8/series
@@ -24,3 +24,4 @@ netfilter-ctnetlink-don-t-permit-ct-creation-with-random-tuple.patch
 netfilter-xt_rpfilter-skip-locally-generated-broadcast-multicast-too.patch
 netfilter-ip6t_npt-fix-translation-for-non-multiple-of-32-prefix-lengths.patch
 ext4-add-check-for-inodes_count-overflow-in-new-resize-ioctl.patch
+r8169-fix-8168evl-frame-padding.patch