浏览代码

be2net: Fix issues in error recovery due to wrong queue state

During recovery from a FW error, destroy queue operation may fail.
Queue should be marked as destroyed so that recovery code can recreate
the queue. Also fix queue created state not getting checked at one instance.

Signed-off-by: Padmanabh Ratnakar <padmanabh.ratnakar@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Padmanabh Ratnakar 13 年之前
父节点
当前提交
aa790db9a7
共有 1 个文件被更改,包括 5 次插入4 次删除
  1. 5 4
      drivers/net/ethernet/emulex/benet/be_cmds.c

+ 5 - 4
drivers/net/ethernet/emulex/benet/be_cmds.c

@@ -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_queue_info *mccq = &adapter->mcc_obj.q;
 	struct be_mcc_wrb *wrb;
 	struct be_mcc_wrb *wrb;
 
 
+	if (!mccq->created)
+		return NULL;
+
 	if (atomic_read(&mccq->used) >= mccq->len) {
 	if (atomic_read(&mccq->used) >= mccq->len) {
 		dev_err(&adapter->pdev->dev, "Out of MCCQ wrbs\n");
 		dev_err(&adapter->pdev->dev, "Out of MCCQ wrbs\n");
 		return NULL;
 		return NULL;
@@ -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);
 	req->id = cpu_to_le16(q->id);
 
 
 	status = be_mbox_notify_wait(adapter);
 	status = be_mbox_notify_wait(adapter);
-	if (!status)
-		q->created = false;
+	q->created = false;
 
 
 	mutex_unlock(&adapter->mbox_lock);
 	mutex_unlock(&adapter->mbox_lock);
 	return status;
 	return status;
@@ -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);
 	req->id = cpu_to_le16(q->id);
 
 
 	status = be_mcc_notify_wait(adapter);
 	status = be_mcc_notify_wait(adapter);
-	if (!status)
-		q->created = false;
+	q->created = false;
 
 
 err:
 err:
 	spin_unlock_bh(&adapter->mcc_lock);
 	spin_unlock_bh(&adapter->mcc_lock);