diff --git a/[refs] b/[refs] index 1777b5f5e34c..45448bd06b00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0da1b995aee447656c0eb77e4e32468e37f868a3 +refs/heads/master: dafdec746f8c468bebf6b99f32a392ee6c8d0212 diff --git a/trunk/drivers/net/ipg.c b/trunk/drivers/net/ipg.c index 9752902f2d9a..b234b293c11f 100644 --- a/trunk/drivers/net/ipg.c +++ b/trunk/drivers/net/ipg.c @@ -1994,7 +1994,7 @@ static int ipg_nic_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) ipg_w32(IPG_DC_TX_DMA_POLL_NOW, DMA_CTRL); if (sp->tx_current == (sp->tx_dirty + IPG_TFDLIST_LENGTH)) - netif_wake_queue(dev); + netif_stop_queue(dev); spin_unlock_irqrestore(&sp->lock, flags);