All of lore.kernel.org
 help / color / mirror / Atom feed
From: Roman Mashak <mrv@mojatatu.com>
To: davem@davemloft.net
Cc: stephen@networkplumber.org, dsahern@gmail.com,
	netdev@vger.kernel.org, Roman Mashak <mrv@mojatatu.com>
Subject: [PATCH net-next v2 1/1] bridge: return error code when deleting Vlan
Date: Thu, 12 Oct 2017 09:51:54 -0400	[thread overview]
Message-ID: <1507816314-2896-1-git-send-email-mrv@mojatatu.com> (raw)

v2:
 Return err immediately if nbp_vlan_delete() fails (pointed by David Ahern)

Signed-off-by: Roman Mashak <mrv@mojatatu.com>
---
 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;
 	}
-- 
1.9.1

             reply	other threads:[~2017-10-12 13:52 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-12 13:51 Roman Mashak [this message]
2017-10-12 14:19 ` [PATCH net-next v2 1/1] bridge: return error code when deleting Vlan David Ahern
2017-10-12 18:07   ` Roman Mashak
2017-10-12 18:12     ` Nikolay Aleksandrov
2017-10-13  2:03       ` Jamal Hadi Salim
2017-10-13  2:15         ` Nikolay Aleksandrov
2017-10-13 14:31           ` David Ahern
2017-10-13 16:00       ` Roman Mashak
2017-10-14 10:52         ` Nikolay Aleksandrov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1507816314-2896-1-git-send-email-mrv@mojatatu.com \
    --to=mrv@mojatatu.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.