From patchwork Thu Oct 12 13:51:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Mashak X-Patchwork-Id: 824866 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=mojatatu-com.20150623.gappssmtp.com header.i=@mojatatu-com.20150623.gappssmtp.com header.b="CN1juXbb"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yCXMs6pL6z9s7p for ; Fri, 13 Oct 2017 00:52:09 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751356AbdJLNwH (ORCPT ); Thu, 12 Oct 2017 09:52:07 -0400 Received: from mail-io0-f193.google.com ([209.85.223.193]:53768 "EHLO mail-io0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751138AbdJLNwG (ORCPT ); Thu, 12 Oct 2017 09:52:06 -0400 Received: by mail-io0-f193.google.com with SMTP id 189so5536699iow.10 for ; Thu, 12 Oct 2017 06:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mojatatu-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=vLjrS75HKMXup/oGQE2LRcUJP8Y7h0ScFV8W8paMgzc=; b=CN1juXbbM2MzCnXpB6ieSe8mxTBemMovbQjFHLlhOHMlcsZVvpFofgFRoL4bEahkrf e3KAbN1pfB6XFozZvb4xdwdLx31CAwCUFM8Fx4EwDbYndEP37CKoLTHN3lsUjbcIvGja 43LR3hjAm8qumDrwc/aurORXQXGwlYppPKcH0rJDOIl8FBfE1pl6q6WrrLNkxPCygdX5 ZrgVzOOF987I2r0McgFMX23M6F+MO6xhvpHK3XrJOfMqbuylC86rQT1/BTagsO7bf5uD c8f1fEJuyXKKcyAYCe6Ht5RHpmh9tmyI3dTchhVVU80CLp8fs8iNMy5N5kGcQ/jb06Rc 79Zw== 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=vLjrS75HKMXup/oGQE2LRcUJP8Y7h0ScFV8W8paMgzc=; b=t3DvC1Hqd6Yk0PVM+1Libjy0V2QKNqhBOovSbP+HlZJ/jFaudh8cGdYaPSb9TTszI8 52SwPWVErCuOhu9qeUF1sqvufEI9c/Tu7WfkQGViuZmqQLP6KmNOcY7V3t468cajJM0f R1vxBDeM4Bw36K4d0vD43n9m4xqcSoAmeq8KXGlYPt2v7wewPqnv1FaHMoYBReXC0dYi EGBaekISUMcWslglkoiRXFVybMbtGFfH/qhqKaVB1aAhIlZIQ9NrBlF0JPKnBNyIZfSr l6guIcU1ky7Eceu2dlN2J7XSkW/1Sm7M1YtUbK1n4YBIYtEVPikfc7/WEwCCiDojSEXL /Ewg== X-Gm-Message-State: AMCzsaWon7WcrIi847vvfr9+6ZR30zRH3iLY18hVVCVMPEBfq58Z7MXX l69cUtpQfOPUBrlyL2xGkjYCXx09 X-Google-Smtp-Source: ABhQp+TNfg1Jc8zXSSMUamgKa40bLhO5z5FAbepdUxUsZqlWBouQ4FcJX8G8UNYChFiulUAqJCFqiA== X-Received: by 10.107.44.78 with SMTP id s75mr2990809ios.110.1507816325982; Thu, 12 Oct 2017 06:52:05 -0700 (PDT) Received: from mojatatu.com ([64.26.149.125]) by smtp.gmail.com with ESMTPSA id g195sm143146itc.14.2017.10.12.06.52.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 06:52:05 -0700 (PDT) From: Roman Mashak To: davem@davemloft.net Cc: stephen@networkplumber.org, dsahern@gmail.com, netdev@vger.kernel.org, Roman Mashak Subject: [PATCH net-next v2 1/1] bridge: return error code when deleting Vlan Date: Thu, 12 Oct 2017 09:51:54 -0400 Message-Id: <1507816314-2896-1-git-send-email-mrv@mojatatu.com> X-Mailer: git-send-email 1.9.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org v2: Return err immediately if nbp_vlan_delete() fails (pointed by David Ahern) Signed-off-by: Roman Mashak --- net/bridge/br_netlink.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index f0e8268..1efdd48 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -527,11 +527,13 @@ static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p, case RTM_DELLINK: if (p) { - nbp_vlan_delete(p, vinfo->vid); + err = nbp_vlan_delete(p, vinfo->vid); + if (err) + break; if (vinfo->flags & BRIDGE_VLAN_INFO_MASTER) - br_vlan_delete(p->br, vinfo->vid); + err = br_vlan_delete(p->br, vinfo->vid); } else { - br_vlan_delete(br, vinfo->vid); + err = br_vlan_delete(br, vinfo->vid); } break; }