| From 4346a80a4d56867b6849a0c5ae5e0ddb28f07883 Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 16 Jan 2011 19:57:55 -0500 |
| Subject: [PATCH] tg3: fix extra arg in netif_tx_lock |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c |
| index 7f82b02..5cdbe0c 100644 |
| --- a/drivers/net/tg3.c |
| +++ b/drivers/net/tg3.c |
| @@ -4410,7 +4410,7 @@ static void tg3_tx(struct tg3_napi *tnapi) |
| |
| if (unlikely(netif_tx_queue_stopped(txq) && |
| (tg3_tx_avail(tnapi) > TG3_TX_WAKEUP_THRESH(tnapi)))) { |
| - __netif_tx_lock(txq, smp_processor_id()); |
| + __netif_tx_lock(txq); |
| if (netif_tx_queue_stopped(txq) && |
| (tg3_tx_avail(tnapi) > TG3_TX_WAKEUP_THRESH(tnapi))) |
| netif_tx_wake_queue(txq); |
| -- |
| 1.7.1.1 |
| |