hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Dan Carpenter 2015-01-21 12:22:35 +03:00 committed by David S. Miller
parent 5c66cfe078
commit 1b846f9282
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/bridge/br_netlink.c
View File

@ -311,17 +311,14 @@ errout:
int br_getlink(struct sk_buff *skb, u32 pid, u32 seq, int br_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev, u32 filter_mask) struct net_device *dev, u32 filter_mask)
{ {
int err = 0;
struct net_bridge_port *port = br_port_get_rtnl(dev); struct net_bridge_port *port = br_port_get_rtnl(dev);
if (!port && !(filter_mask & RTEXT_FILTER_BRVLAN) && if (!port && !(filter_mask & RTEXT_FILTER_BRVLAN) &&
!(filter_mask & RTEXT_FILTER_BRVLAN_COMPRESSED)) !(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); filter_mask, dev);
out:
return err;
} }
static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p, static int br_vlan_info(struct net_bridge *br, struct net_bridge_port *p,