net/core: Make use of assign_bit() API

We have for some time the assign_bit() API to replace open coded

	if (foo)
		set_bit(n, bar);
	else
		clear_bit(n, bar);

Use this API in the code. No functional change intended.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>
Message-ID: <20230710100830.89936-1-andriy.shevchenko@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/core/dev.c b/net/core/dev.c
index 69a3e54..d6e1b78 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6316,12 +6316,8 @@ int dev_set_threaded(struct net_device *dev, bool threaded)
         * softirq mode will happen in the next round of napi_schedule().
         * This should not cause hiccups/stalls to the live traffic.
         */
-       list_for_each_entry(napi, &dev->napi_list, dev_list) {
-               if (threaded)
-                       set_bit(NAPI_STATE_THREADED, &napi->state);
-               else
-                       clear_bit(NAPI_STATE_THREADED, &napi->state);
-       }
+       list_for_each_entry(napi, &dev->napi_list, dev_list)
+               assign_bit(NAPI_STATE_THREADED, &napi->state, threaded);
 
        return err;
 }

diff --git a/net/core/sock.c b/net/core/sock.c
index 9370fd5..ab1e8d1 100644 (file)
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -1244,17 +1244,11 @@ set_sndbuf:
                break;
 
        case SO_PASSCRED:
-               if (valbool)
-                       set_bit(SOCK_PASSCRED, &sock->flags);
-               else
-                       clear_bit(SOCK_PASSCRED, &sock->flags);
+               assign_bit(SOCK_PASSCRED, &sock->flags, valbool);
                break;
 
        case SO_PASSPIDFD:
-               if (valbool)
-                       set_bit(SOCK_PASSPIDFD, &sock->flags);
-               else
-                       clear_bit(SOCK_PASSPIDFD, &sock->flags);
+               assign_bit(SOCK_PASSPIDFD, &sock->flags, valbool);
                break;
 
        case SO_TIMESTAMP_OLD:
@@ -1358,10 +1352,7 @@ set_sndbuf:
                break;
 
        case SO_PASSSEC:
-               if (valbool)
-                       set_bit(SOCK_PASSSEC, &sock->flags);
-               else
-                       clear_bit(SOCK_PASSSEC, &sock->flags);
+               assign_bit(SOCK_PASSSEC, &sock->flags, valbool);
                break;
        case SO_MARK:
                if (!sockopt_ns_capable(sock_net(sk)->user_ns, CAP_NET_RAW) &&