---

yaml --- r: 132403 b: refs/heads/master c: 97d477a h: refs/heads/master i: 132401: 9b72922 132399: 0741678 v: v3
git-mirror · Mar 16, 2009 · c827e95 · c827e95
1 parent 3d17eb8
commit c827e95
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git 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
@@ -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;
 }