From patchwork Thu Mar 1 16:52:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Danny Kukawka X-Patchwork-Id: 144075 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 AD71FB6F62 for ; Fri, 2 Mar 2012 03:55:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758346Ab2CAQxM (ORCPT ); Thu, 1 Mar 2012 11:53:12 -0500 Received: from wp188.webpack.hosteurope.de ([80.237.132.195]:51633 "EHLO wp188.webpack.hosteurope.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757057Ab2CAQxL (ORCPT ); Thu, 1 Mar 2012 11:53:11 -0500 Received: from nat.nue.novell.com ([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 1S39Fa-0008Do-Tx; Thu, 01 Mar 2012 17:53:06 +0100 From: Danny Kukawka To: Jon Mason Cc: Danny Kukawka , netdev@vger.kernel.org, "David S. Miller" , linux-kernel@vger.kernel.org Subject: [PATCH 6/7] neterion/s2io: fix s2io_set_mac_addr() to prevent double checks Date: Thu, 1 Mar 2012 17:52:26 +0100 Message-Id: <1330620747-4047-7-git-send-email-danny.kukawka@bisect.de> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1330620747-4047-1-git-send-email-danny.kukawka@bisect.de> References: <1330620747-4047-1-git-send-email-danny.kukawka@bisect.de> X-bounce-key: webpack.hosteurope.de; danny.kukawka@bisect.de; 1330620790; 9199eb16; Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fix s2io_set_mac_addr() to prevent double validation checks from dev_set_mac_address(). Don't use s2io_set_mac_addr() in s2io_io_resume() since it makes no sense to copy netdev->dev_addr to itself. Use do_s2io_prog_unicast() instead since this is what's needed and checked here. Signed-off-by: Danny Kukawka --- drivers/net/ethernet/neterion/s2io.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 22a8de0..cf7b3eb 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c @@ -5247,9 +5247,6 @@ static int s2io_set_mac_addr(struct net_device *dev, void *p) { struct sockaddr *addr = p; - if (!is_valid_ether_addr(addr->sa_data)) - return -EADDRNOTAVAIL; - memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); /* store the MAC address in CAM */ @@ -8658,7 +8655,7 @@ static void s2io_io_resume(struct pci_dev *pdev) return; } - if (s2io_set_mac_addr(netdev, netdev->dev_addr) == FAILURE) { + if (do_s2io_prog_unicast(netdev, netdev->dev_addr) == FAILURE) { s2io_card_down(sp); pr_err("Can't restore mac addr after reset.\n"); return;