From db9eaa496c4f6e125b1badb88bc1975821e6c0ff Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Sun, 18 Mar 2012 17:11:22 -0400 Subject: [PATCH] --- yaml --- r: 291579 b: refs/heads/master c: 5407b14c6792d6ff122ecb1a2a6acffad60ef389 h: refs/heads/master i: 291577: 20dbfeba04de3ab10bcdc0b9ca3c42f4f8406dca 291575: 2b28da19adb1a23332de1588c4e11dc79f1f637d v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/gianfar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3b6903e18564..05c2cad76b2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1571df8f2d470a2b0cb3d48ffdffbc83c5924ef5 +refs/heads/master: 5407b14c6792d6ff122ecb1a2a6acffad60ef389 diff --git a/trunk/drivers/net/ethernet/freescale/gianfar.c b/trunk/drivers/net/ethernet/freescale/gianfar.c index 6e66cc35c970..d9428f0e738a 100644 --- a/trunk/drivers/net/ethernet/freescale/gianfar.c +++ b/trunk/drivers/net/ethernet/freescale/gianfar.c @@ -2565,7 +2565,7 @@ static int gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue) } /* If we freed a buffer, we can restart transmission, if necessary */ - if (__netif_subqueue_stopped(dev, tqi) && tx_queue->num_txbdfree) + if (netif_tx_queue_stopped(txq) && tx_queue->num_txbdfree) netif_wake_subqueue(dev, tqi); /* Update dirty indicators */