From 18c27c252e50e14e406422f25f1631d4dcc71c97 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Thu, 10 Jan 2008 23:53:15 +0100 Subject: [PATCH] --- yaml --- r: 75563 b: refs/heads/master c: 47cccd7d7cc1f2b6f34aadc9041fb991c6293cdd h: refs/heads/master i: 75561: 7914c4844b904614adc637a95d2c22e803173568 75559: d7b215ec93e2f3e5faa3957ca374c8553e4711af v: v3 --- [refs] | 2 +- trunk/drivers/net/ipg.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 45448bd06b00..e7de2d9283ee 100644 --- 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 index b234b293c11f..50f0c17451b1 100644 --- 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. */