Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b846f92 authored by Dan Carpenter's avatar Dan Carpenter Committed by David S. Miller
Browse files

bridge: simplify br_getlink() a bit 



Static checkers complain that we should maybe set "ret" before we do the
"goto out;".  They interpret the NULL return from br_port_get_rtnl() as
a failure and forgetting to set the error code is a common bug in this
situation.

The code is confusing but it's actually correct.  We are returning zero
deliberately.  Let's re-write it a bit to be more clear.

Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Acked-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5c66cfe0

net/bridge/br_netlink.c

+3 −6
Original line number Diff line number Diff line
@@ -311,17 +311,14 @@ void br_ifinfo_notify(int event, struct net_bridge_port *port) 
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,

	       struct net_device *dev, u32 filter_mask)

{

	int err = 0;

	struct net_bridge_port *port = br_port_get_rtnl(dev);



	if (!port && !(filter_mask & RTEXT_FILTER_BRVLAN) &&

	    !(filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED))

		goto out;

		return 0;



	err = br_fill_ifinfo(skb, port, pid, seq, RTM_NEWLINK, NLM_F_MULTI,

	return br_fill_ifinfo(skb, port, pid, seq, RTM_NEWLINK, NLM_F_MULTI,

			      filter_mask, dev);

out:

	return err;

}



static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p,