From patchwork Wed Feb 8 21:10:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Kukawka X-Patchwork-Id: 140270 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 7C680B6EF1 for ; Thu, 9 Feb 2012 08:32:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757447Ab2BHVRl (ORCPT ); Wed, 8 Feb 2012 16:17:41 -0500 Received: from wp188.webpack.hosteurope.de ([80.237.132.195]:56720 "EHLO wp188.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756150Ab2BHVRj (ORCPT ); Wed, 8 Feb 2012 16:17:39 -0500 Received: from charybdis-ext.suse.de ([195.135.221.2] helo=g231.suse.de); authenticated by wp188.webpack.hosteurope.de running ExIM with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) id 1RvEnO-0005UX-F4; Wed, 08 Feb 2012 22:11:18 +0100 From: Danny Kukawka To: "David S. Miller" Cc: Danny Kukawka , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Christian Benvenuti , Roopa Prabhu , David Wang Subject: [PATCH 50/50] use dev_hw_addr_random() instead of random_ether_addr() Date: Wed, 8 Feb 2012 22:10:57 +0100 Message-Id: <1328735457-29986-51-git-send-email-danny.kukawka@bisect.de> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1328735457-29986-1-git-send-email-danny.kukawka@bisect.de> References: <1328735457-29986-1-git-send-email-danny.kukawka@bisect.de> X-bounce-key: webpack.hosteurope.de; danny.kukawka@bisect.de; 1328735859; fa74df84; Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use dev_hw_addr_random() instead of calling random_ether_addr() to set addr_assign_type correctly to NET_ADDR_RANDOM. Reset the state to NET_ADDR_PERM as soon as the MAC get changed via .ndo_set_mac_address. Signed-off-by: Danny Kukawka --- drivers/net/ethernet/cisco/enic/enic_main.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index ab3f67f..3e7cb54 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -865,6 +865,8 @@ static int enic_set_mac_addr(struct net_device *netdev, char *addr) } memcpy(netdev->dev_addr, addr, netdev->addr_len); + if (netdev->addr_assign_type & NET_ADDR_RANDOM) + netdev->addr_assign_type ^= NET_ADDR_RANDOM; return 0; } @@ -1119,7 +1121,7 @@ static int enic_set_vf_port(struct net_device *netdev, int vf, memcpy(pp->mac_addr, prev_pp.vf_mac, ETH_ALEN); if (vf == PORT_SELF_VF && is_zero_ether_addr(netdev->dev_addr)) - random_ether_addr(netdev->dev_addr); + dev_hw_addr_random(netdev, netdev->dev_addr); err = enic_process_set_pp_request(enic, vf, &prev_pp, &restore_pp); if (err) { @@ -2272,6 +2274,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, int err; #ifdef CONFIG_PCI_IOV int pos = 0; + bool random_mac = false; #endif int num_pps = 1; @@ -2467,11 +2470,17 @@ static int __devinit enic_probe(struct pci_dev *pdev, (void)enic_change_mtu(netdev, enic->port_mtu); #ifdef CONFIG_PCI_IOV - if (enic_is_sriov_vf(enic) && is_zero_ether_addr(enic->mac_addr)) + if (enic_is_sriov_vf(enic) && is_zero_ether_addr(enic->mac_addr)) { random_ether_addr(enic->mac_addr); + random_mac = true; + } #endif err = enic_set_mac_addr(netdev, enic->mac_addr); +#ifdef CONFIG_PCI_IOV + if (random_mac) + netdev->addr_assign_type |= NET_ADDR_RANDOM; +#endif if (err) { dev_err(dev, "Invalid MAC address, aborting\n"); goto err_out_dev_deinit;