From patchwork Thu Jul 10 08:17:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Gundersen X-Patchwork-Id: 368536 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 5A4631400B9 for ; Thu, 10 Jul 2014 18:36:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046AbaGJISJ (ORCPT ); Thu, 10 Jul 2014 04:18:09 -0400 Received: from mail-lb0-f171.google.com ([209.85.217.171]:37220 "EHLO mail-lb0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752018AbaGJISE (ORCPT ); Thu, 10 Jul 2014 04:18:04 -0400 Received: by mail-lb0-f171.google.com with SMTP id s7so5785405lbd.2 for ; Thu, 10 Jul 2014 01:18:02 -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=QEBpj5cjxp5MuiAuESbmB+JdAsqNDVhReymKArsRckU=; b=jNlyOcGMPb6mCmtYsHnKohqLUZphhGBViXEqE5Lz7RqqUUSwcDJ0Lc4oF736Tanxjo k7EeIvIkcTf6R3ESHhsSRgMIQ/9ZAasQ5GjUmCH3FMId37zudwpG9qrRqePbiFWG9mRq neXMFODWflFFGz2T/YWsdWs32WWrp6ZaJl2jGh+/z+/4NbCrsLlnnJmlNxlfZPvCn/Xd WfFUuxmpPxTaq1RRE0L3OJCbW/n1e+lz7BMslfxRZ9m7cItFc9rOo1viQ5H8AAqycgxY WWHxPxK+yOqNmfHmTYMi2Re1dOHClMuD/SenWYuXiZcXHI4Fa6ELYOuyqYNr094bwY82 LJ2A== X-Gm-Message-State: ALoCoQnapPsbizbpaCbiXmXO/3s99yO/ssMyrOEbStIrR4gnTF+9xb8yyInXdEVblq81vF8DRdCj X-Received: by 10.112.133.70 with SMTP id pa6mr1382132lbb.69.1404980282708; Thu, 10 Jul 2014 01:18:02 -0700 (PDT) Received: from localhost.localdomain (m188-149-105-114.cust.tele2.no. [188.149.105.114]) by mx.google.com with ESMTPSA id tg1sm37154793lbb.11.2014.07.10.01.18.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Jul 2014 01:18:01 -0700 (PDT) From: Tom Gundersen To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, David Miller , David Herrmann , Kay Sievers , Tom Gundersen Subject: [PATCH v7 02/33] net: set name assign type for renamed devices Date: Thu, 10 Jul 2014 10:17:07 +0200 Message-Id: <1404980258-30853-3-git-send-email-teg@jklm.no> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1404980258-30853-1-git-send-email-teg@jklm.no> References: <1404980258-30853-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. 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..7765ec5 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1083,6 +1083,7 @@ static int dev_get_valid_name(struct net *net, int dev_change_name(struct net_device *dev, const char *newname) { char oldname[IFNAMSIZ]; + unsigned char old_assign_type; int err = 0; int ret; struct net *net; @@ -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",