From 363cce3f6b2818bc65e145f1164da2ac86ded44e Mon Sep 17 00:00:00 2001 From: Eilon Greenstein Date: Tue, 21 Jul 2009 05:47:41 +0000 Subject: [PATCH] --- yaml --- r: 159015 b: refs/heads/master c: e15107065d073714dc47cf6b80c8bf5eea1bf18b h: refs/heads/master i: 159013: 95c17e7ba0b9c490ae0d6ec08f74bdc49850eb6e 159011: b1f5979440c2934c9c6ca78e8c765ae4f3e43c68 159007: 0fbb73e8845fb2e8f42f08a8bfdc78d879ed0e3f v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x_main.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 55582f4d8786..3c04cd29d2fe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37dbbf32a0d45f0ed88f92cb6d0c35f4809e3a8e +refs/heads/master: e15107065d073714dc47cf6b80c8bf5eea1bf18b diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c index f20df6d7dcb5..18c380330bed 100644 --- a/trunk/drivers/net/bnx2x_main.c +++ b/trunk/drivers/net/bnx2x_main.c @@ -706,6 +706,8 @@ static void bnx2x_int_disable_sync(struct bnx2x *bp, int disable_hw) /* disable interrupt handling */ atomic_inc(&bp->intr_sem); + smp_wmb(); /* Ensure that bp->intr_sem update is SMP-safe */ + if (disable_hw) /* prevent the HW from sending interrupts */ bnx2x_int_disable(bp); @@ -6642,7 +6644,12 @@ static void bnx2x_napi_disable(struct bnx2x *bp) static void bnx2x_netif_start(struct bnx2x *bp) { - if (atomic_dec_and_test(&bp->intr_sem)) { + int intr_sem; + + intr_sem = atomic_dec_and_test(&bp->intr_sem); + smp_wmb(); /* Ensure that bp->intr_sem update is SMP-safe */ + + if (intr_sem) { if (netif_running(bp->dev)) { bnx2x_napi_enable(bp); bnx2x_int_enable(bp); @@ -8229,6 +8236,7 @@ static int __devinit bnx2x_init_bp(struct bnx2x *bp) /* Disable interrupt handling until HW is initialized */ atomic_set(&bp->intr_sem, 1); + smp_wmb(); /* Ensure that bp->intr_sem update is SMP-safe */ mutex_init(&bp->port.phy_mutex);