From patchwork Wed Oct 20 20:17:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasanthy Kolluri X-Patchwork-Id: 68471 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 A3084B70DF for ; Thu, 21 Oct 2010 07:17:09 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755461Ab0JTURF (ORCPT ); Wed, 20 Oct 2010 16:17:05 -0400 Received: from sj-iport-5.cisco.com ([171.68.10.87]:10398 "EHLO sj-iport-5.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755355Ab0JTURE (ORCPT ); Wed, 20 Oct 2010 16:17:04 -0400 Authentication-Results: sj-iport-5.cisco.com; dkim=neutral (message not signed) header.i=none X-IronPort-AV: E=Sophos;i="4.57,356,1283731200"; d="scan'208";a="272862404" Received: from sj-core-5.cisco.com ([171.71.177.238]) by sj-iport-5.cisco.com with ESMTP; 20 Oct 2010 20:17:04 +0000 Received: from savbu-pc100.cisco.com (savbu-pc100.cisco.com [10.193.164.29]) by sj-core-5.cisco.com (8.13.8/8.14.3) with ESMTP id o9KKH4kY006366; Wed, 20 Oct 2010 20:17:04 GMT Subject: [net-next-2.6 PATCH 2/5] enic: Make firmware cognizant of the user set mac address To: davem@davemloft.net From: Vasanthy Kolluri Cc: netdev@vger.kernel.org, roprabhu@cisco.com, dwang2@cisco.com Date: Wed, 20 Oct 2010 13:17:04 -0700 Message-ID: <20101020201704.26870.68966.stgit@savbu-pc100.cisco.com> In-Reply-To: <20101020201609.26870.80308.stgit@savbu-pc100.cisco.com> References: <20101020201609.26870.80308.stgit@savbu-pc100.cisco.com> User-Agent: StGit/0.15 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vasanthy Kolluri Let the firmware know about the mac address set by the user using ndo_set_mac_address Signed-off-by: Vasanthy Kolluri Signed-off-by: Roopa Prabhu Signed-off-by: David Wang --- drivers/net/enic/enic_main.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c index dcfc541..622106d 100644 --- a/drivers/net/enic/enic_main.c +++ b/drivers/net/enic/enic_main.c @@ -974,8 +974,19 @@ static int enic_set_mac_address_dynamic(struct net_device *netdev, void *p) static int enic_set_mac_address(struct net_device *netdev, void *p) { struct sockaddr *saddr = p; + char *addr = saddr->sa_data; + struct enic *enic = netdev_priv(netdev); + int err; + + err = enic_dev_del_station_addr(enic); + if (err) + return err; + + err = enic_set_mac_addr(netdev, addr); + if (err) + return err; - return enic_set_mac_addr(netdev, (char *)saddr->sa_data); + return enic_dev_add_station_addr(enic); } static int enic_dev_packet_filter(struct enic *enic, int directed,