From patchwork Tue Jan 1 13:30:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 208906 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 4FB752C00A6 for ; Wed, 2 Jan 2013 00:30:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752300Ab3AANab (ORCPT ); Tue, 1 Jan 2013 08:30:31 -0500 Received: from mail-ee0-f42.google.com ([74.125.83.42]:33552 "EHLO mail-ee0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752239Ab3AANa3 (ORCPT ); Tue, 1 Jan 2013 08:30:29 -0500 Received: by mail-ee0-f42.google.com with SMTP id c41so6382672eek.1 for ; Tue, 01 Jan 2013 05:30:27 -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=mGCSvyX+UznVxCpTWP8/wKRXG57sK3kNoPOhpAqtIYk=; b=j9DXTBfZYQ9wEzxwj1uqljhxHsk1W8Aadl52xp4AgOS4vVH4K2dqjYPCWk8YaSn5FM 4O0ZvtObAVYTiU1tQvmBa0SmkdoBWjlPaOd2OqEJLpfD8+ncJRc1OPDJPBvJPxvJ9JUJ dBaLtCpIOJZHgnBfpas8umDpwWSb9WVkgC7VSV+R5Fc6oLTfelrCWBg9xxnIcIn+AerM HdohQrgYMUTcND7/FARatTJWqJP6KBHTX2On7FZC4eKnTrrXuT0wI+rsQMx85rC1vX6Y fPDRZYOD3ORGxK3F/00vP9KdayW3/YWCqHlawp4asi1uyohlCEEobcQ2Xv7xenZGsdqB OkUg== X-Received: by 10.14.214.132 with SMTP id c4mr117510485eep.18.1357047027521; Tue, 01 Jan 2013 05:30:27 -0800 (PST) Received: from localhost (sun-0.pirko.cz. [84.16.102.25]) by mx.google.com with ESMTPS id q44sm91168486eep.5.2013.01.01.05.30.25 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 01 Jan 2013 05:30:26 -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 1/7] rtnl: use dev_set_mac_address() instead of plain ndo_ Date: Tue, 1 Jan 2013 14:30:13 +0100 Message-Id: <1357047019-1037-2-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: ALoCoQmOmdpjLjXp5yKEVQJ74U1TR8rcUIQ2GZLcafJl1LTTy+ubCaluFUY5czzX4RfEsGfvf5YE Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Benefit from existence of dev_set_mac_address() and remove duplicate code. Signed-off-by: Jiri Pirko --- net/core/rtnetlink.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 2ef7a56..78d05a9 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -1310,7 +1310,6 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm, struct nlattr **tb, char *ifname, int modified) { const struct net_device_ops *ops = dev->netdev_ops; - int send_addr_notify = 0; int err; if (tb[IFLA_NET_NS_PID] || tb[IFLA_NET_NS_FD]) { @@ -1363,16 +1362,6 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm, struct sockaddr *sa; int len; - if (!ops->ndo_set_mac_address) { - err = -EOPNOTSUPP; - goto errout; - } - - if (!netif_device_present(dev)) { - err = -ENODEV; - goto errout; - } - len = sizeof(sa_family_t) + dev->addr_len; sa = kmalloc(len, GFP_KERNEL); if (!sa) { @@ -1382,13 +1371,11 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm, sa->sa_family = dev->type; memcpy(sa->sa_data, nla_data(tb[IFLA_ADDRESS]), dev->addr_len); - err = ops->ndo_set_mac_address(dev, sa); + err = dev_set_mac_address(dev, sa); kfree(sa); if (err) goto errout; - send_addr_notify = 1; modified = 1; - add_device_randomness(dev->dev_addr, dev->addr_len); } if (tb[IFLA_MTU]) { @@ -1425,7 +1412,7 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm, if (tb[IFLA_BROADCAST]) { nla_memcpy(dev->broadcast, tb[IFLA_BROADCAST], dev->addr_len); - send_addr_notify = 1; + call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); } if (ifm->ifi_flags || ifm->ifi_change) { @@ -1546,9 +1533,6 @@ errout: net_warn_ratelimited("A link change request failed with some changes committed already. Interface %s may have been left with an inconsistent configuration, please check.\n", dev->name); - if (send_addr_notify) - call_netdevice_notifiers(NETDEV_CHANGEADDR, dev); - return err; }