From 3d0d62041895e8506f238241f3a19c90758e14d2 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Wed, 8 Jun 2011 19:29:32 +0000 Subject: [PATCH] --- yaml --- r: 255468 b: refs/heads/master c: 93736656138e6d2f39f19c1d68f9ef81cfc9dd66 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/cnic.c | 13 ++++--------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 8db07bd3f435..4664c17bc49f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b77bdde97ae8241dcc23110a4e837acfbc83438 +refs/heads/master: 93736656138e6d2f39f19c1d68f9ef81cfc9dd66 diff --git a/trunk/drivers/net/cnic.c b/trunk/drivers/net/cnic.c index 11a92afdf982..5c0a669dfa5f 100644 --- a/trunk/drivers/net/cnic.c +++ b/trunk/drivers/net/cnic.c @@ -2778,13 +2778,10 @@ static u32 cnic_service_bnx2_queues(struct cnic_dev *dev) /* Tell compiler that status_blk fields can change. */ barrier(); - if (status_idx != *cp->kcq1.status_idx_ptr) { - status_idx = (u16) *cp->kcq1.status_idx_ptr; - /* status block index must be read first */ - rmb(); - cp->kwq_con_idx = *cp->kwq_con_idx_ptr; - } else - break; + status_idx = (u16) *cp->kcq1.status_idx_ptr; + /* status block index must be read first */ + rmb(); + cp->kwq_con_idx = *cp->kwq_con_idx_ptr; } CNIC_WR16(dev, cp->kcq1.io_addr, cp->kcq1.sw_prod_idx); @@ -2908,8 +2905,6 @@ static u32 cnic_service_bnx2x_kcq(struct cnic_dev *dev, struct kcq_info *info) /* Tell compiler that sblk fields can change. */ barrier(); - if (last_status == *info->status_idx_ptr) - break; last_status = *info->status_idx_ptr; /* status block index must be read before reading the KCQ */