From c827e95d255ea8b196499f7a23a12dc032a86d03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?fran=C3=A7ois=20romieu?= <romieu@fr.zoreil.com>
Date: Sun, 15 Mar 2009 01:09:54 +0000
Subject: [PATCH] --- yaml --- r: 132403 b: refs/heads/master c:
 97d477a914b146e7e6722ded21afa79886ae8ccd h: refs/heads/master i:   132401:
 9b72922ecc42e9f51c3c98a2a0bffbfd1573999d   132399:
 0741678c0c404083b152f54a183724e93c5487f3 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r8169.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 4517d90fbefc..c30aee849720 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 682337fe062e939578d933c74157ae9a36baa4ce
+refs/heads/master: 97d477a914b146e7e6722ded21afa79886ae8ccd
diff --git a/trunk/drivers/net/r8169.c b/trunk/drivers/net/r8169.c
index b3473401c83a..352da2a43c9f 100644
--- a/trunk/drivers/net/r8169.c
+++ b/trunk/drivers/net/r8169.c
@@ -3363,13 +3363,6 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
 		opts1 |= FirstFrag;
 	} else {
 		len = skb->len;
-
-		if (unlikely(len < ETH_ZLEN)) {
-			if (skb_padto(skb, ETH_ZLEN))
-				goto err_update_stats;
-			len = ETH_ZLEN;
-		}
-
 		opts1 |= FirstFrag | LastFrag;
 		tp->tx_skb[entry].skb = skb;
 	}
@@ -3407,7 +3400,6 @@ static int rtl8169_start_xmit(struct sk_buff *skb, struct net_device *dev)
 err_stop:
 	netif_stop_queue(dev);
 	ret = NETDEV_TX_BUSY;
-err_update_stats:
 	dev->stats.tx_dropped++;
 	goto out;
 }