From patchwork Mon Jul 14 14:37:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 369659 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 0A710140097 for ; Tue, 15 Jul 2014 00:37:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755820AbaGNOhx (ORCPT ); Mon, 14 Jul 2014 10:37:53 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:46000 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754157AbaGNOhp (ORCPT ); Mon, 14 Jul 2014 10:37:45 -0400 Received: by mail-wg0-f42.google.com with SMTP id l18so4153252wgh.1 for ; Mon, 14 Jul 2014 07:37:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9LMgaPI09sQJtdF69lbKreNaRvJ1/0qlWUYv1N8hdOs=; b=mAQKZqIe1q+Z3L3tGciG+x5XtBfLydC/0amUe5MQX0ca3hcCcJdDquyBDMMFFOlODa 1c64BH5Y3c0dV/pK2bOGZYhc+Ry7ngWRWVxgz0ufYpyZCpic73Vj/sXi098B5qq1r8rO FTsc2gyoQ989mUmaVhv2tIKI1eIhEc2TYj/8YJr75PHtqNqbIzPOKEK8vcWMkAwDKq58 bkQXv2EKcuvZA6oPUfIs0aCbM84wSq+RjqjgCDw0n4Bj/S+gwB/RJK7G8Oju0cuiOz1P fN6dtR2CKUWbaL9ODEzjhLyKZbpt/Wk81wEIz1+2iZPZapjlJgjj2SKUUamDVqxRSkUI AxuQ== X-Gm-Message-State: ALoCoQlmKWaDXJZQrW6Do2NAdCkaz04ZNBBeSizMV0yhN5mMAW1o7llClsMPUSmzV963dzF3NBC7 X-Received: by 10.194.78.141 with SMTP id b13mr4046017wjx.111.1405348664105; Mon, 14 Jul 2014 07:37:44 -0700 (PDT) Received: from tomegun-x240.localdomain (cm-84.208.72.173.getinternet.no. [84.208.72.173]) by mx.google.com with ESMTPSA id de6sm25893225wjc.16.2014.07.14.07.37.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jul 2014 07:37:43 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: David Miller , linux-kernel@vger.kernel.org, Tom Gundersen Subject: [PATCH v9 2/4] net: set name assign type for renamed devices Date: Mon, 14 Jul 2014 16:37:23 +0200 Message-Id: <1405348645-1995-2-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1405348645-1995-1-git-send-email-teg@jklm.no> References: <1405348645-1995-1-git-send-email-teg@jklm.no> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Based on a patch from David Herrmann. This is the only place devices can be renamed. v9: restore revers-christmas-tree order of local variables Signed-off-by: Tom Gundersen Reviewed-by: David Herrmann --- net/core/dev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/core/dev.c b/net/core/dev.c index 30eedf6..80ae059 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1082,6 +1082,7 @@ static int dev_get_valid_name(struct net *net, */ int dev_change_name(struct net_device *dev, const char *newname) { + unsigned char old_assign_type; char oldname[IFNAMSIZ]; int err = 0; int ret; @@ -1109,10 +1110,14 @@ int dev_change_name(struct net_device *dev, const char *newname) return err; } + old_assign_type = dev->name_assign_type; + dev->name_assign_type = NET_NAME_RENAMED; + rollback: ret = device_rename(&dev->dev, dev->name); if (ret) { memcpy(dev->name, oldname, IFNAMSIZ); + dev->name_assign_type = old_assign_type; write_seqcount_end(&devnet_rename_seq); return ret; } @@ -1141,6 +1146,8 @@ rollback: write_seqcount_begin(&devnet_rename_seq); memcpy(dev->name, oldname, IFNAMSIZ); memcpy(oldname, newname, IFNAMSIZ); + dev->name_assign_type = old_assign_type; + old_assign_type = NET_NAME_RENAMED; goto rollback; } else { pr_err("%s: name change rollback failed: %d\n",