From patchwork Mon Dec 9 12:38:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wen-chien Jesse Sung X-Patchwork-Id: 299024 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id B046E2C00A5 for ; Mon, 9 Dec 2013 23:43:02 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Vq0As-000411-L8; Mon, 09 Dec 2013 12:42:58 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Vq0Ab-0003vn-4c for kernel-team@lists.ubuntu.com; Mon, 09 Dec 2013 12:42:41 +0000 Received: from [112.105.106.20] (helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1Vq0Aa-0006v5-GL; Mon, 09 Dec 2013 12:42:41 +0000 From: Wen-chien Jesse Sung To: kernel-team@lists.ubuntu.com Subject: [Saucy][PATCH 6/6] be2net: delete primary MAC address while unloading Date: Mon, 9 Dec 2013 20:38:56 +0800 Message-Id: <1386592736-5623-6-git-send-email-jesse.sung@canonical.com> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386592736-5623-1-git-send-email-jesse.sung@canonical.com> References: <1386592736-5623-1-git-send-email-jesse.sung@canonical.com> Cc: Sathya Perla , YK , Sureshkumar Reddy Reddygari X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Sathya Perla BugLink: https://launchpad.net/bugs/1257227 Currently the UC-list is being deleted from the HW MAC table, but the primary MAC is not. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller (cherry picked from commit 2d17f4031475f2e836dd06d5b03593ee59f12fbd) Signed-off-by: Wen-chien Jesse Sung --- drivers/net/ethernet/emulex/benet/be_main.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 48170c5..0ded53d 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -2796,7 +2796,7 @@ done: static int be_clear(struct be_adapter *adapter) { - int i = 1; + int i; if (adapter->flags & BE_FLAGS_WORKER_SCHEDULED) { cancel_delayed_work_sync(&adapter->work); @@ -2806,9 +2806,11 @@ static int be_clear(struct be_adapter *adapter) if (sriov_enabled(adapter)) be_vf_clear(adapter); - for (; adapter->uc_macs > 0; adapter->uc_macs--, i++) + /* delete the primary mac along with the uc-mac list */ + for (i = 0; i < (adapter->uc_macs + 1); i++) be_cmd_pmac_del(adapter, adapter->if_handle, - adapter->pmac_id[i], 0); + adapter->pmac_id[i], 0); + adapter->uc_macs = 0; be_cmd_if_destroy(adapter, adapter->if_handle, 0);