From 947a94773e8dd101d60e91bc65c2fd1127fea7c3 Mon Sep 17 00:00:00 2001 From: Mugunthan V N Date: Fri, 15 Mar 2013 04:10:16 +0000 Subject: [PATCH] --- yaml --- r: 361461 b: refs/heads/master c: 75b9b61bb8a18e75afe7b10dd55681e748fa27df h: refs/heads/master i: 361459: 83ac552dd4b8c6c65c66a58c36675db6306feae7 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/ti/davinci_emac.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index aef4f52b8144..cac94a01cce9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db0b82760ef84562b5c0fa880c22b4f352545554 +refs/heads/master: 75b9b61bb8a18e75afe7b10dd55681e748fa27df diff --git a/trunk/drivers/net/ethernet/ti/davinci_emac.c b/trunk/drivers/net/ethernet/ti/davinci_emac.c index 52c05366599a..ae1b77aa199f 100644 --- a/trunk/drivers/net/ethernet/ti/davinci_emac.c +++ b/trunk/drivers/net/ethernet/ti/davinci_emac.c @@ -1102,7 +1102,7 @@ static int emac_dev_xmit(struct sk_buff *skb, struct net_device *ndev) /* If there is no more tx desc left free then we need to * tell the kernel to stop sending us tx frames. */ - if (unlikely(cpdma_check_free_tx_desc(priv->txchan))) + if (unlikely(!cpdma_check_free_tx_desc(priv->txchan))) netif_stop_queue(ndev); return NETDEV_TX_OK;