From 4352813e499a236f34e7285f33d53fff480d04d0 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Mon, 21 Jan 2013 10:38:39 +0100 Subject: [PATCH] --- yaml --- r: 351506 b: refs/heads/master c: 7373470202a3c98e1a338bf1acf51247cd100868 h: refs/heads/master 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 dc8152a3d49d..57d1a5e9b125 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 825863408a1670035e7105368cbfe8b126290ba1 +refs/heads/master: 7373470202a3c98e1a338bf1acf51247cd100868 diff --git a/trunk/drivers/net/ethernet/ti/davinci_emac.c b/trunk/drivers/net/ethernet/ti/davinci_emac.c index 1c97c8171d3e..242ec55110d2 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->txch))) + if (unlikely(cpdma_check_free_tx_desc(priv->txchan))) netif_stop_queue(ndev); return NETDEV_TX_OK;