From d146f38c141f617246f2188337b77a81fcc216a0 Mon Sep 17 00:00:00 2001 From: Eilon Greenstein Date: Thu, 12 Feb 2009 08:37:25 +0000 Subject: [PATCH] --- yaml --- r: 134549 b: refs/heads/master c: 3e5b510eb8c9ea5f762e0a0a9ce59254d6671dce h: refs/heads/master i: 134547: a24db62188db8c847205faa5ba1d7b98c462f01a v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 95a394931d08..a4fb22175509 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b3a0f0ba3c6c26330b49db178de3898a54f9f8a +refs/heads/master: 3e5b510eb8c9ea5f762e0a0a9ce59254d6671dce diff --git a/trunk/drivers/net/bnx2x_main.c b/trunk/drivers/net/bnx2x_main.c index 6bd92199db21..2e95799a0db2 100644 --- a/trunk/drivers/net/bnx2x_main.c +++ b/trunk/drivers/net/bnx2x_main.c @@ -7173,7 +7173,7 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) struct bnx2x_fastpath *fp = &bp->fp[i]; cnt = 1000; - smp_rmb(); + smp_mb(); while (bnx2x_has_tx_work_unload(fp)) { bnx2x_tx_int(fp, 1000); @@ -7189,7 +7189,7 @@ static int bnx2x_nic_unload(struct bnx2x *bp, int unload_mode) } cnt--; msleep(1); - smp_rmb(); + smp_mb(); } } /* Give HW time to discard old tx messages */