Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 340419
b: refs/heads/master
c: aa790db
h: refs/heads/master
i:
  340417: 06b1fa6
  340415: a5e7aac
v: v3
  • Loading branch information
Padmanabh Ratnakar authored and David S. Miller committed Oct 22, 2012
1 parent d80d88b commit d2d04dc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: db15dfa957c6b904e88d70f2f3f1c0b95cafd6b9
refs/heads/master: aa790db9a7a3a9591f4d5ba0dead00e99dcd9412
9 changes: 5 additions & 4 deletions trunk/drivers/net/ethernet/emulex/benet/be_cmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,9 @@ static struct be_mcc_wrb *wrb_from_mccq(struct be_adapter *adapter)
struct be_queue_info *mccq = &adapter->mcc_obj.q;
struct be_mcc_wrb *wrb;

if (!mccq->created)
return NULL;

if (atomic_read(&mccq->used) >= mccq->len) {
dev_err(&adapter->pdev->dev, "Out of MCCQ wrbs\n");
return NULL;
Expand Down Expand Up @@ -1235,8 +1238,7 @@ int be_cmd_q_destroy(struct be_adapter *adapter, struct be_queue_info *q,
req->id = cpu_to_le16(q->id);

status = be_mbox_notify_wait(adapter);
if (!status)
q->created = false;
q->created = false;

mutex_unlock(&adapter->mbox_lock);
return status;
Expand All @@ -1263,8 +1265,7 @@ int be_cmd_rxq_destroy(struct be_adapter *adapter, struct be_queue_info *q)
req->id = cpu_to_le16(q->id);

status = be_mcc_notify_wait(adapter);
if (!status)
q->created = false;
q->created = false;

err:
spin_unlock_bh(&adapter->mcc_lock);
Expand Down

0 comments on commit d2d04dc

Please sign in to comment.