diff options
| author | Colin Ian King <colin.king@canonical.com> | 2021-03-24 16:09:50 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-24 20:45:48 +0100 |
| commit | ad248f7761eb9a3ff9ba2a8c93b548600185a938 (patch) | |
| tree | 126ec4542e099e0f86bdc417e3ce80ecbb3c5f42 /net/bridge | |
| parent | Merge branch 'bridge-mrp-next' (diff) | |
| download | linux-ad248f7761eb9a3ff9ba2a8c93b548600185a938.tar.xz linux-ad248f7761eb9a3ff9ba2a8c93b548600185a938.zip | |
net: bridge: Fix missing return assignment from br_vlan_replay_one call
The call to br_vlan_replay_one is returning an error return value but
this is not being assigned to err and the following check on err is
currently always false because err was initialized to zero. Fix this
by assigning err.
Addresses-Coverity: ("'Constant' variable guards dead code")
Fixes: 22f67cdfae6a ("net: bridge: add helper to replay VLANs installed on port")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Acked-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_vlan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_vlan.c b/net/bridge/br_vlan.c index ca8daccff217..6f961cb5f771 100644 --- a/net/bridge/br_vlan.c +++ b/net/bridge/br_vlan.c @@ -1815,7 +1815,7 @@ int br_vlan_replay(struct net_device *br_dev, struct net_device *dev, if (!br_vlan_should_use(v)) continue; - br_vlan_replay_one(nb, dev, &vlan, extack); + err = br_vlan_replay_one(nb, dev, &vlan, extack); if (err) return err; } |