From patchwork Mon Aug 17 10:58:04 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sathya Perla X-Patchwork-Id: 31508 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 0931AB6F2B for ; Mon, 17 Aug 2009 20:58:30 +1000 (EST) Received: by ozlabs.org (Postfix) id EE963DDDA0; Mon, 17 Aug 2009 20:58:29 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 6EFFDDDD0B for ; Mon, 17 Aug 2009 20:58:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757599AbZHQK6U (ORCPT ); Mon, 17 Aug 2009 06:58:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751754AbZHQK6T (ORCPT ); Mon, 17 Aug 2009 06:58:19 -0400 Received: from segment-124-30.sify.net ([124.30.166.146]:41076 "EHLO sperla-laptop.localdomain" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1756895AbZHQK6T (ORCPT ); Mon, 17 Aug 2009 06:58:19 -0400 Received: by sperla-laptop.localdomain (Postfix, from userid 1000) id 573A317E5F0; Mon, 17 Aug 2009 16:28:04 +0530 (IST) Date: Mon, 17 Aug 2009 16:28:04 +0530 From: Sathya Perla To: netdev Subject: [net-next-2.6 PATCH 1/3] be2net: Set mac addr in hw regardless of netif_running() Message-ID: <20090817105803.GA10217@serverengines.com> Reply-To: Sathya Perla MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org be_mac_addr_set() currently is broken when netif_running() is false. Signed-off-by: Sathya Perla --- drivers/net/benet/be_main.c | 15 +++++---------- 1 files changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 45507d8..3623460 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -117,23 +117,18 @@ void be_cq_notify(struct be_adapter *adapter, u16 qid, bool arm, u16 num_popped) iowrite32(val, adapter->db + DB_CQ_OFFSET); } - static int be_mac_addr_set(struct net_device *netdev, void *p) { struct be_adapter *adapter = netdev_priv(netdev); struct sockaddr *addr = p; int status = 0; - if (netif_running(netdev)) { - status = be_cmd_pmac_del(adapter, adapter->if_handle, - adapter->pmac_id); - if (status) - return status; - - status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data, - adapter->if_handle, &adapter->pmac_id); - } + status = be_cmd_pmac_del(adapter, adapter->if_handle, adapter->pmac_id); + if (status) + return status; + status = be_cmd_pmac_add(adapter, (u8 *)addr->sa_data, + adapter->if_handle, &adapter->pmac_id); if (!status) memcpy(netdev->dev_addr, addr->sa_data, netdev->addr_len);