From patchwork Tue Jan 1 13:30:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 208907 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 E01C12C00AA for ; Wed, 2 Jan 2013 00:30:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752313Ab3AANad (ORCPT ); Tue, 1 Jan 2013 08:30:33 -0500 Received: from mail-ee0-f51.google.com ([74.125.83.51]:61216 "EHLO mail-ee0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752239Ab3AANab (ORCPT ); Tue, 1 Jan 2013 08:30:31 -0500 Received: by mail-ee0-f51.google.com with SMTP id d4so6398619eek.10 for ; Tue, 01 Jan 2013 05:30:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=MsJVlik/j7lIEO0O+Zt2Cen6f4pTlgpcJKNpCzhb690=; b=d+RCQ25AZsSmN2nYWWqp6x0qsMBv55DdPYkonHQjEjTpcg1k4dG6CpuCmtsRn0nEVp bBzlL3Rsk6fNMZym18VviULZFy4yZmEtYjFttEt/7USuoqTX75wnDHh2AnDjtEqiKnam NHyNnDVmlZnV5x5mhH1k/LqJ6WUVzYeUcPgmFPSPb3BqZLUe/HsbBxapmJnQtfca4VnA V983VJa1MQp0Rahsf/l68/9MleIPN04Z3s3QbMEaProSVtbeGFXEvJkuG4JQEqJm0dde /HDLe2ofuYK1nKqj1R49gNTBXvS39wtMFK2SEM1OO6IC353yXIcyvvc9relhZOQHia1X 7kKQ== X-Received: by 10.14.2.196 with SMTP id 44mr117734473eef.25.1357047030657; Tue, 01 Jan 2013 05:30:30 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id b49sm91296523eem.16.2013.01.01.05.30.28 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 Jan 2013 05:30:30 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, bhutchings@solarflare.com, shemminger@vyatta.com, sassmann@redhat.com, kaber@trash.net, richard@nod.at Subject: [patch net-next 2/7] net: call add_device_randomness() only after successful mac change Date: Tue, 1 Jan 2013 14:30:14 +0100 Message-Id: <1357047019-1037-3-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1357047019-1037-1-git-send-email-jiri@resnulli.us> References: <1357047019-1037-1-git-send-email-jiri@resnulli.us> X-Gm-Message-State: ALoCoQlH8YUpTbTFwLwpgAOJBVOljOp56USQtJNZpsiIL8dPZkzqJ2HLFmBjBE3P3kWmSiiyiyjB Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jiri Pirko --- net/core/dev.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 21c5b97..c85e32b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -5020,10 +5020,11 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa) if (!netif_device_present(dev)) return -ENODEV; err = ops->ndo_set_mac_address(dev, sa); - if (!err) - call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); + if (err) + return err; + call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); add_device_randomness(dev->dev_addr, dev->addr_len); - return err; + return 0; } EXPORT_SYMBOL(dev_set_mac_address);