Merge branch 'for-6.9/amd-sfh' into for-linus

[sfrench/cifs-2.6.git] / net / ethtool / features.c

diff --git a/net/ethtool/features.c b/net/ethtool/features.c
index a79af8c25a07121baf0e66f30f9161c9cf7cdee6..b6cb101d7f19ef5038f6f0e10139b1e5ccfa4af5 100644 (file)
--- a/net/ethtool/features.c
+++ b/net/ethtool/features.c
@@ -234,17 +234,20 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info)
        dev = req_info.dev;
 
        rtnl_lock();
+       ret = ethnl_ops_begin(dev);
+       if (ret < 0)
+               goto out_rtnl;
        ethnl_features_to_bitmap(old_active, dev->features);
        ethnl_features_to_bitmap(old_wanted, dev->wanted_features);
        ret = ethnl_parse_bitset(req_wanted, req_mask, NETDEV_FEATURE_COUNT,
                                 tb[ETHTOOL_A_FEATURES_WANTED],
                                 netdev_features_strings, info->extack);
        if (ret < 0)
-               goto out_rtnl;
+               goto out_ops;
        if (ethnl_bitmap_to_features(req_mask) & ~NETIF_F_ETHTOOL_BITS) {
                GENL_SET_ERR_MSG(info, "attempt to change non-ethtool features");
                ret = -EINVAL;
-               goto out_rtnl;
+               goto out_ops;
        }
 
        /* set req_wanted bits not in req_mask from old_wanted */
@@ -281,6 +284,8 @@ int ethnl_set_features(struct sk_buff *skb, struct genl_info *info)
        if (mod)
                netdev_features_change(dev);
 
+out_ops:
+       ethnl_ops_complete(dev);
 out_rtnl:
        rtnl_unlock();
        ethnl_parse_header_dev_put(&req_info);