From patchwork Wed Aug 19 03:27:10 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Aleksandrov X-Patchwork-Id: 508761 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 8F2F4140D16 for ; Thu, 20 Aug 2015 01:01:02 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932096AbbHSPA5 (ORCPT ); Wed, 19 Aug 2015 11:00:57 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:35665 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753263AbbHSPAv (ORCPT ); Wed, 19 Aug 2015 11:00:51 -0400 Received: by wicne3 with SMTP id ne3so123078835wic.0 for ; Wed, 19 Aug 2015 08:00:50 -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=4iqd6uzlunyO/JxtDP0QiolLEWmXRtr6xhPzYMVo1IA=; b=fKDG39q2xuvwTXZMHOtcLlxcMvF2xXUmqcjvRuzZqNmYzV6QO9cuMQxtHiTkbRNUe/ 4Ovbmr3kHuHlbRu0oHKl2A/xSPKAU6St/v+O386m/ZYey92B3AAiwmp/ybBpqLpdkIHQ 6wwOHMayq4TkMW7iXiSSilIsNSc77D6hrph2s8wiMidqViCuypPuxqrzsFVcdA7cfwNV KEfn3kxyQfoHWZsb2O7oDj0mpMWWIY7A4Njw6OBwfuk97//HVIOpkemJqpk6SlVQfr6K fSy/NehMRZ4PNz8Fpu4i/y5k198NJ0H9Bw/pKQGdH+c5pMSmBdeJeOKe5JPC3XmhH7oY bKUQ== X-Gm-Message-State: ALoCoQkeajgmooyjcuLkt3+EwR2BHvl/l9wee7Ukt1o92m9PMcuxW4+0nAeD6yVRSTjFV3W9pWtv X-Received: by 10.180.105.36 with SMTP id gj4mr54328030wib.64.1439996450217; Wed, 19 Aug 2015 08:00:50 -0700 (PDT) Received: from dev.localdomain ([93.152.202.124]) by smtp.gmail.com with ESMTPSA id k12sm1449483wjw.4.2015.08.19.08.00.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Aug 2015 08:00:49 -0700 (PDT) From: Nikolay Aleksandrov To: netdev@vger.kernel.org Cc: dsa@cumulusnetworks.com, shm@cumulusnetworks.com, davem@davemloft.net, Nikolay Aleksandrov Subject: [PATCH net-next 4/4] vrf: ndo_add|del_slave drop unnecessary checks Date: Wed, 19 Aug 2015 06:27:10 +0300 Message-Id: <1439954830-24947-5-git-send-email-razor@blackwall.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1439954830-24947-1-git-send-email-razor@blackwall.org> References: <1439954830-24947-1-git-send-email-razor@blackwall.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Nikolay Aleksandrov When ndo_add|del_slave ops are used, they're taken from the respective master device's netdev ops, so if the master device is a VRF only then the VRF ops will get called thus no need to check the type of the master. Signed-off-by: Nikolay Aleksandrov --- drivers/net/vrf.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 4825c65c62fd..dbeffe789185 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -393,8 +393,7 @@ out_fail: static int vrf_add_slave(struct net_device *dev, struct net_device *port_dev) { - if (!netif_is_vrf(dev) || netif_is_vrf(port_dev) || - vrf_is_slave(port_dev)) + if (netif_is_vrf(port_dev) || vrf_is_slave(port_dev)) return -EINVAL; return do_vrf_add_slave(dev, port_dev); @@ -431,9 +430,6 @@ static int do_vrf_del_slave(struct net_device *dev, struct net_device *port_dev) static int vrf_del_slave(struct net_device *dev, struct net_device *port_dev) { - if (!netif_is_vrf(dev)) - return -EINVAL; - return do_vrf_del_slave(dev, port_dev); }