diff options
| author | YueHaibing <yuehaibing@huawei.com> | 2018-12-17 17:46:23 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-12-18 15:50:13 -0800 |
| commit | a26d94bff4d5af7c9bf5d5e779282e2258966ec3 (patch) | |
| tree | eac1620621adf699e925ab0f4e992bfa4cb21d49 /net/bridge/br_netlink.c | |
| parent | 8937388acb09d6bf0f263fa8551d3e2b4e84de25 (diff) | |
| download | linux-a26d94bff4d5af7c9bf5d5e779282e2258966ec3.tar.bz2 | |
net: bridge: remove unneeded variable 'err'
function br_multicast_toggle now always return 0,
so the variable 'err' is unneeded.
Also cleanup dead branch in br_changelink.
Signed-off-by: YueHaibing <yuehaibing@huawei.com>
Acked-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_netlink.c')
| -rw-r--r-- | net/bridge/br_netlink.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c index 935495b93a99..9c07591b0232 100644 --- a/net/bridge/br_netlink.c +++ b/net/bridge/br_netlink.c @@ -1175,9 +1175,7 @@ static int br_changelink(struct net_device *brdev, struct nlattr *tb[], if (data[IFLA_BR_MCAST_SNOOPING]) { u8 mcast_snooping = nla_get_u8(data[IFLA_BR_MCAST_SNOOPING]); - err = br_multicast_toggle(br, mcast_snooping); - if (err) - return err; + br_multicast_toggle(br, mcast_snooping); } if (data[IFLA_BR_MCAST_QUERY_USE_IFADDR]) { |