From patchwork Fri Apr 27 08:58:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: solomon X-Patchwork-Id: 155397 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 EF3B1B6EE6 for ; Fri, 27 Apr 2012 18:57:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759111Ab2D0I5x (ORCPT ); Fri, 27 Apr 2012 04:57:53 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:42608 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754832Ab2D0I5w (ORCPT ); Fri, 27 Apr 2012 04:57:52 -0400 Received: by pbbrp8 with SMTP id rp8so311209pbb.19 for ; Fri, 27 Apr 2012 01:57:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :content-type:content-transfer-encoding; bh=m9NJ7C0JuE1ufvB8QB8pPYe9hBHmbTPBgGhNYUkAvS4=; b=U7+MUXb6XBEKmk4ADrOBBWwJZChbYgPIAQqJb8QtJkBkT/LgYgT7iRT7/AjL54T7Dx UiiXWA1gcn7ZCG/JbiMka0eORybMvA/xnKsdrLi05ecjzibZyIvx3wAi7Pzg/Y1l7/Ww OAkSlrQS9JbjrsJQlAYHFpj/EraH2rDHK4ZiCuzncuY7VX5rIR+hRGBOeeCHByAAt9sa fwdjyIa3Re4mAzehtbNjHs5eI9C1u3yV60aFjI6S8okbvdfHC3Zjn/OPCKhqcolSVPvZ e+tWKfM3d9nlSX4zyjQHshrWbu/bxxArxuPcdSKyn7Bmo7EUX5LiWfohoSE7dmg55M/d zbAw== Received: by 10.68.236.165 with SMTP id uv5mr2779539pbc.37.1335517071872; Fri, 27 Apr 2012 01:57:51 -0700 (PDT) Received: from [172.30.10.112] ([113.108.76.195]) by mx.google.com with ESMTPS id qb8sm5898478pbb.12.2012.04.27.01.57.45 (version=SSLv3 cipher=OTHER); Fri, 27 Apr 2012 01:57:51 -0700 (PDT) Message-ID: <4F9A5FBC.1060607@gmail.com> Date: Fri, 27 Apr 2012 16:58:36 +0800 From: Shan Wei User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:12.0) Gecko/20120420 Thunderbird/12.0 MIME-Version: 1.0 To: samuelliao@tencent.com, Jeffrey T Kirsher , Jesse Brandeburg , bruce.w.allan@intel.com, carolyn.wyborny@intel.com, donald.c.skidmore@intel.com, gregory.v.rose@intel.com, peter.p.waskiewicz.jr@intel.com, alexander.h.duyck@intel.com, John Ronciak , David Miller , mitch.a.williams@intel.com, jpirko@redhat.com, danny.kukawka@bisect.de CC: "e1000-devel@lists.sourceforge.net" , NetDev Subject: [PATCH BUG-FIX] igbvf: fix the bug when initializing the igbvf Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Samuel Liao Maybe it's a typo, but it cause that igbvf can't be initialized successfully. Set perm_addr value using valid dev_addr, although which is equal to hw.mac.addr. Signed-off-by: Samuel Liao Signed-off-by: Shan Wei --- drivers/net/ethernet/intel/igbvf/netdev.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index d61ca2a..8ec74b0 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c @@ -2731,14 +2731,14 @@ static int __devinit igbvf_probe(struct pci_dev *pdev, netdev->addr_len); } - if (!is_valid_ether_addr(netdev->perm_addr)) { + if (!is_valid_ether_addr(netdev->dev_addr)) { dev_err(&pdev->dev, "Invalid MAC Address: %pM\n", netdev->dev_addr); err = -EIO; goto err_hw_init; } - memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len); + memcpy(netdev->perm_addr, netdev->dev_addr, netdev->addr_len); setup_timer(&adapter->watchdog_timer, &igbvf_watchdog, (unsigned long) adapter);