]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
net: ethtool: reduce indent for _rxfh_context ops
authorJakub Kicinski <kuba@kernel.org>
Mon, 7 Jul 2025 18:41:15 +0000 (11:41 -0700)
committerJakub Kicinski <kuba@kernel.org>
Tue, 8 Jul 2025 18:56:40 +0000 (11:56 -0700)
Now that we don't have the compat code we can reduce the indent
a little. No functional changes.

Reviewed-by: Gal Pressman <gal@nvidia.com>
Reviewed-by: Edward Cree <ecree.xilinx@gmail.com>
Link: https://patch.msgid.link/20250707184115.2285277-6-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ethtool/ioctl.c

index d8a17350d3e8cda211d79275f7a9642450274984..139f95620cddb552b97374cb689c3495e1c70492 100644 (file)
@@ -1664,25 +1664,19 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,
        rxfh_dev.rss_context = rxfh.rss_context;
        rxfh_dev.input_xfrm = rxfh.input_xfrm;
 
-       if (rxfh.rss_context) {
-               if (create) {
-                       ret = ops->create_rxfh_context(dev, ctx, &rxfh_dev,
-                                                      extack);
-                       /* Make sure driver populates defaults */
-                       WARN_ON_ONCE(!ret && !rxfh_dev.key &&
-                                    ops->rxfh_per_ctx_key &&
-                                    !memchr_inv(ethtool_rxfh_context_key(ctx),
-                                                0, ctx->key_size));
-               } else if (rxfh_dev.rss_delete) {
-                       ret = ops->remove_rxfh_context(dev, ctx,
-                                                      rxfh.rss_context,
-                                                      extack);
-               } else {
-                       ret = ops->modify_rxfh_context(dev, ctx, &rxfh_dev,
-                                                      extack);
-               }
-       } else {
+       if (!rxfh.rss_context) {
                ret = ops->set_rxfh(dev, &rxfh_dev, extack);
+       } else if (create) {
+               ret = ops->create_rxfh_context(dev, ctx, &rxfh_dev, extack);
+               /* Make sure driver populates defaults */
+               WARN_ON_ONCE(!ret && !rxfh_dev.key && ops->rxfh_per_ctx_key &&
+                            !memchr_inv(ethtool_rxfh_context_key(ctx), 0,
+                                        ctx->key_size));
+       } else if (rxfh_dev.rss_delete) {
+               ret = ops->remove_rxfh_context(dev, ctx, rxfh.rss_context,
+                                              extack);
+       } else {
+               ret = ops->modify_rxfh_context(dev, ctx, &rxfh_dev, extack);
        }
        if (ret) {
                if (create) {