---

yaml --- r: 75563 b: refs/heads/master c: 47cccd7 h: refs/heads/master i: 75561: 7914c48 75559: d7b215e v: v3
git-mirror · Jan 17, 2008 · 18c27c2 · 18c27c2
1 parent 6dd800e
commit 18c27c2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dafdec746f8c468bebf6b99f32a392ee6c8d0212
+refs/heads/master: 47cccd7d7cc1f2b6f34aadc9041fb991c6293cdd
diff --git a/trunk/drivers/net/ipg.c b/trunk/drivers/net/ipg.c
@@ -1934,10 +1934,7 @@ static int ipg_nic_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 	 */
 	if (sp->tenmbpsmode)
 		txfd->tfc |= cpu_to_le64(IPG_TFC_TXINDICATE);
-	else if (!((sp->tx_current - sp->tx_dirty + 1) >
-	    IPG_FRAMESBETWEENTXDMACOMPLETES)) {
-		txfd->tfc |= cpu_to_le64(IPG_TFC_TXDMAINDICATE);
-	}
+	txfd->tfc |= cpu_to_le64(IPG_TFC_TXDMAINDICATE);
 	/* Based on compilation option, determine if FCS is to be
 	 * appended to transmit frame by IPG.
 	 */