From patchwork Mon Jul 29 02:03:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 262638 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C3DA22C0106 for ; Mon, 29 Jul 2013 11:42:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754008Ab3G2BmS (ORCPT ); Sun, 28 Jul 2013 21:42:18 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:4318 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752045Ab3G2BmN (ORCPT ); Sun, 28 Jul 2013 21:42:13 -0400 Received: from [10.9.208.57] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Sun, 28 Jul 2013 18:38:15 -0700 X-Server-Uuid: 06151B78-6688-425E-9DE2-57CB27892261 Received: from IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) by IRVEXCHCAS08.corp.ad.broadcom.com (10.9.208.57) with Microsoft SMTP Server (TLS) id 14.1.438.0; Sun, 28 Jul 2013 18:42:04 -0700 Received: from mail-irva-13.broadcom.com (10.10.10.20) by IRVEXCHSMTP2.corp.ad.broadcom.com (10.9.207.52) with Microsoft SMTP Server id 14.1.438.0; Sun, 28 Jul 2013 18:42:04 -0700 Received: from dell (dhcp-10-12-137-56.irv.broadcom.com [10.12.137.56]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 6E99EF2D79; Sun, 28 Jul 2013 18:42:04 -0700 (PDT) From: "Michael Chan" To: davem@davemloft.net cc: netdev@vger.kernel.org Subject: [PATCH 5/6 net-next] cnic: Add missing error checking for RAMROD_CMD_ID_CLOSE Date: Sun, 28 Jul 2013 19:03:59 -0700 Message-ID: <1375063440-4016-5-git-send-email-mchan@broadcom.com> X-Mailer: git-send-email 1.5.5.GIT In-Reply-To: <1375063440-4016-4-git-send-email-mchan@broadcom.com> References: <1375063440-4016-1-git-send-email-mchan@broadcom.com> <1375063440-4016-2-git-send-email-mchan@broadcom.com> <1375063440-4016-3-git-send-email-mchan@broadcom.com> <1375063440-4016-4-git-send-email-mchan@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 7DEB180D31W61216969-02-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Eddie Wai Completion status field should also be checked for non-zero error condition. Signed-off-by: Eddie Wai Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/cnic.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index 24f2a09..07ec4ce 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c @@ -4022,15 +4022,18 @@ static void cnic_cm_process_kcqe(struct cnic_dev *dev, struct kcqe *kcqe) cnic_cm_upcall(cp, csk, opcode); break; - case L5CM_RAMROD_CMD_ID_CLOSE: - if (l4kcqe->status != 0) { - netdev_warn(dev->netdev, "RAMROD CLOSE compl with " - "status 0x%x\n", l4kcqe->status); + case L5CM_RAMROD_CMD_ID_CLOSE: { + struct iscsi_kcqe *l5kcqe = (struct iscsi_kcqe *) kcqe; + + if (l4kcqe->status != 0 || l5kcqe->completion_status != 0) { + netdev_warn(dev->netdev, "RAMROD CLOSE compl with status 0x%x completion status 0x%x\n", + l4kcqe->status, l5kcqe->completion_status); opcode = L4_KCQE_OPCODE_VALUE_CLOSE_COMP; /* Fall through */ } else { break; } + } case L4_KCQE_OPCODE_VALUE_RESET_RECEIVED: case L4_KCQE_OPCODE_VALUE_CLOSE_COMP: case L4_KCQE_OPCODE_VALUE_RESET_COMP: