From patchwork Fri Jun 16 14:23:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Serhey Popovych X-Patchwork-Id: 776781 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 3wq2gl1LpJz9s7m for ; Sat, 17 Jun 2017 00:24:35 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="P8DHpMGV"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754211AbdFPOY2 (ORCPT ); Fri, 16 Jun 2017 10:24:28 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:33110 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753832AbdFPOYX (ORCPT ); Fri, 16 Jun 2017 10:24:23 -0400 Received: by mail-lf0-f65.google.com with SMTP id u62so4370779lfg.0 for ; Fri, 16 Jun 2017 07:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:in-reply-to :references; bh=cDVp0v0tIg+CUbdXF3GMaYjecSuDg1O1zkDkWl0hlLE=; b=P8DHpMGVJKvW8ssgRfom3yigyoqrTtfs2zOt4LfcTQVWFHw2y4elQOLlj5GNMzAIkn 1UfbWiQH2eGxMq6suKI6xGpNZRrXKo6yB7sqXGd+1Mr959HFDELC76pkiZiZdHCD+JYO RkdcvmYpHW7Xk2wm3N/EzhrPkvDS40cJ83fIwD8dtXJySyeMtlZgOXvT3VyFsGmqXD1i m2uuJQ49uCU9uP3qFtNBIO4Z350q+hGrrolFUwgBWqZ1BwUXQEdgV1ekZiNnqX6eXQIR 8ROTJAVuuF+94evssGn+syJyJEVFkhsCgM+x484NSNr58NT9umxqr5Kj9+ur9IQmhDGI sWUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=cDVp0v0tIg+CUbdXF3GMaYjecSuDg1O1zkDkWl0hlLE=; b=n2PmsWwnWnEDkgwffCojq92GQ505PSVvlk+6ydBsSKELFRkzT7MkFpCXICTGCekhXX ebbgt6TaAdW4IWVR02Fto9BizvCTe3lHqxGD0yuD7PEmBh+yeYMnjZ4BudED00+LqN7l VP+U3MXo1KHSVAxlv5ow2ZRUHZ109TE4QXYgfKr1tInHMCxdEo9jn2SF7JPhztIp+B1b QGPmwpuRhUVhLwp0HoDhRb8dMMBqS95AP4+CrCpueF8E7sf3YEBIv6bViTzYz6RJdysX 1rt74AZ7e+xQMdtgRa/xa6wq8ep/y/C+QilJSs7mVDXVBz6F99awnAN/VkEKfdmk6AbS VC6w== X-Gm-Message-State: AKS2vOz8OB5GLhHN6daE/fOVt3r8uDlMAcz7XVM9PQ/t2/juq2x0glD3 mUc8jPX35bYo9/GF/D7f7g== X-Received: by 10.25.23.72 with SMTP id n69mr3654070lfi.93.1497623061213; Fri, 16 Jun 2017 07:24:21 -0700 (PDT) Received: from tuxracer.synapse.com ([195.238.92.77]) by smtp.gmail.com with ESMTPSA id z10sm486566lja.6.2017.06.16.07.24.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 16 Jun 2017 07:24:20 -0700 (PDT) From: Serhey Popovych To: netdev@vger.kernel.org Subject: [PATCH 3/3] veth: Set ifindex only if given and not negative Date: Fri, 16 Jun 2017 17:23:53 +0300 Message-Id: <86924b2059b7460b8998fac46f0d7262d7c358d4.1497621810.git.serhe.popovych@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There is already check for ifindex being non negative in register_netdevice(). Do the same here for convenience. Fixes: e6f8f1a739b6 ("veth: Allow to create peer link with given ifindex") Signed-off-by: Serhey Popovych --- drivers/net/veth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/veth.c b/drivers/net/veth.c index 0156fe8..0689433 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -405,7 +405,7 @@ static int veth_newlink(struct net *src_net, struct net_device *dev, if (tbp[IFLA_ADDRESS] == NULL) eth_hw_addr_random(peer); - if (ifmp && (dev->ifindex != 0)) + if (ifmp && dev->ifindex > 0) peer->ifindex = ifmp->ifi_index; err = register_netdevice(peer);