From 8ff7db616de4b5636ff5158db5cdfddd2cbba736 Mon Sep 17 00:00:00 2001 From: Henrique Camargo Date: Mon, 2 Aug 2010 17:10:42 +0000 Subject: [PATCH] --- yaml --- r: 204027 b: refs/heads/master c: eabd8ba9060444cac5b89a3306e607c15ec37418 h: refs/heads/master i: 204025: c566091bc429ee2c6e1a6308a8f052a5bb41e6ae 204023: 16c3bc4787ef625dc02baca302fcfb9ca3eff019 v: v3 --- [refs] | 2 +- trunk/drivers/net/davinci_emac.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 232cf3c535f6..06ea6ec139b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81a618595a29af6aec615d093feac65ee7329b74 +refs/heads/master: eabd8ba9060444cac5b89a3306e607c15ec37418 diff --git a/trunk/drivers/net/davinci_emac.c b/trunk/drivers/net/davinci_emac.c index 2fe709f98cc4..d0824e322068 100644 --- a/trunk/drivers/net/davinci_emac.c +++ b/trunk/drivers/net/davinci_emac.c @@ -1302,8 +1302,8 @@ static int emac_net_tx_complete(struct emac_priv *priv, struct net_device *ndev = priv->ndev; u32 cnt; - if (unlikely(num_tokens && netif_queue_stopped(dev))) - netif_start_queue(dev); + if (unlikely(num_tokens && netif_queue_stopped(ndev))) + netif_start_queue(ndev); for (cnt = 0; cnt < num_tokens; cnt++) { struct sk_buff *skb = (struct sk_buff *)net_data_tokens[cnt]; if (skb == NULL)