Merge tag 'amd-drm-fixes-5.6-2020-02-26' of git://people.freedesktop.org/~agd5f/linux...

[linux.git] / net / ethtool / bitset.c

diff --git a/net/ethtool/bitset.c b/net/ethtool/bitset.c
index fce45dac42056b26a61ca71d527dfb70e3d16b33..8977fe1f394622d150e7c97c86b8ee61348aa22c 100644 (file)
--- a/net/ethtool/bitset.c
+++ b/net/ethtool/bitset.c
@@ -447,7 +447,10 @@ ethnl_update_bitset32_verbose(u32 *bitmap, unsigned int nbits,
                                    "mask only allowed in compact bitset");
                return -EINVAL;
        }
+
        no_mask = tb[ETHTOOL_A_BITSET_NOMASK];
+       if (no_mask)
+               ethnl_bitmap32_clear(bitmap, 0, nbits, mod);
 
        nla_for_each_nested(bit_attr, tb[ETHTOOL_A_BITSET_BITS], rem) {
                bool old_val, new_val;