From patchwork Wed Jan 18 23:02:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahesh Bandewar X-Patchwork-Id: 716905 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 3v3jPt1jzsz9stc for ; Thu, 19 Jan 2017 10:10:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=bandewar-net.20150623.gappssmtp.com header.i=@bandewar-net.20150623.gappssmtp.com header.b="mFMl8UMJ"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751136AbdARXKy (ORCPT ); Wed, 18 Jan 2017 18:10:54 -0500 Received: from mail-pg0-f66.google.com ([74.125.83.66]:33941 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750846AbdARXKw (ORCPT ); Wed, 18 Jan 2017 18:10:52 -0500 Received: by mail-pg0-f66.google.com with SMTP id t6so2429468pgt.1 for ; Wed, 18 Jan 2017 15:09:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bandewar-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=/jZQ1MeF30oOBfGpt6xSuS2+5ISLDlHpNWHVwDlgPWw=; b=mFMl8UMJLx1xukZr7boN/871GMadyMkgdmIwKfwOi0PwbucRiEdtwBrItUkoT/T3QX XIBAfj5CVtMiizh4Wt+gsxVtDFTzFaHs8s4rTImy0tqyczEaoIfMtVKlUYWgOlACea2y uvEjztlsoEFevHRaIi/3eWY1sQkEeRtmTC3R++JZNqfN7gBaBVjgE0QNP22oBDLB3GOm ZxRqY8ouMjOTUMBoP8jYqcC01ljuz7q1hndVvvgtvZxVd42iDIfw9B1AeQD3tVYFidZA Lv7Ge7eg4gGpQudgox9uN9LLn5UNmFPaugJroGxpjghrUeoYZgfT7ri6rpqypNCJRnJl pEMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/jZQ1MeF30oOBfGpt6xSuS2+5ISLDlHpNWHVwDlgPWw=; b=f1EtYdpAg7Q87HKWRUDChDXfSt5fJBLgvXXOj3TwejItskOAeYWFBPWVDSAPbBUOjL ye0v5F2w72g6BM4AMyZ+K9i+m5WEX4h1BFEXMxnP90Tly8AkEBWI70nNhTFmqtpdtAoy Kl8r3GtXlFQttdQ5SFgHNVG9JjxQ1mm1/DukUn+KY/eY0bx5eQI3TaD3L2NsVOOpdv94 0PUFnwvEkGvfuFN2q9WKNGsVGHLYTqSw+WaIstaJxCyvSWRr27lL62vQvfuen1eRkApY 3qVqIzr/oXFk2DmC7wgG9qD3c9AVYZ1Obou68krU3JMfaoEW3gWH9A48LNR1avenP4vI 5AOA== X-Gm-Message-State: AIkVDXKhO8h1qcmpWqhKjvgSVd+IuXnys0nCSpEYA9KoNhDGaCs/BNEbvq7Enqggn4TNDA== X-Received: by 10.84.133.1 with SMTP id 1mr8594693plf.151.1484780575525; Wed, 18 Jan 2017 15:02:55 -0800 (PST) Received: from localhost ([2620:0:1000:3012:c511:1074:5e:8342]) by smtp.gmail.com with ESMTPSA id e90sm3172716pfl.32.2017.01.18.15.02.54 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Wed, 18 Jan 2017 15:02:54 -0800 (PST) From: Mahesh Bandewar To: David Miller Cc: Eric Dumazet , netdev , Mahesh Bandewar , Mahesh Bandewar Subject: [PATCH next 2/3] ipvlan: use netdev_is_rx_handler_busy instead of checking specific type Date: Wed, 18 Jan 2017 15:02:53 -0800 Message-Id: <20170118230253.20811-1-mahesh@bandewar.net> X-Mailer: git-send-email 2.11.0.483.g087da7b7c-goog Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Mahesh Bandewar IPvlan checks if the master device is already used by checking a specific device (here it's macvlan device). This is technically not sufficient and it should just ensure the rx_handler is busy or not. This would be a super check that includes macvlan and any other that has already registered rx-handler. Signed-off-by: Mahesh Bandewar --- drivers/net/ipvlan/ipvlan_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ipvlan/ipvlan_main.c b/drivers/net/ipvlan/ipvlan_main.c index b5c390f0f2b3..95b18f4602cf 100644 --- a/drivers/net/ipvlan/ipvlan_main.c +++ b/drivers/net/ipvlan/ipvlan_main.c @@ -102,8 +102,8 @@ static int ipvlan_port_create(struct net_device *dev) return -EINVAL; } - if (netif_is_macvlan_port(dev)) { - netdev_err(dev, "Master is a macvlan port.\n"); + if (netdev_is_rx_handler_busy(dev)) { + netdev_err(dev, "Device is already in use.\n"); return -EBUSY; }