| Message ID | 20230710100830.89936-1-andriy.shevchenko@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 274c4a6d529cff48b241b15627b46b0f65987ade |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,resend,v1,1/2] net/core: Make use of assign_bit() API | expand |
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Date: Mon, 10 Jul 2023 13:08:29 +0300 > 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> Thanks, Olek
Hello: This series was applied to netdev/net-next.git (main) by Paolo Abeni <pabeni@redhat.com>: On Mon, 10 Jul 2023 13:08:29 +0300 you wrote: > We have for some time the assign_bit() API to replace open coded > > if (foo) > set_bit(n, bar); > else > clear_bit(n, bar); > > [...] Here is the summary with links: - [net-next,resend,v1,1/2] net/core: Make use of assign_bit() API https://git.kernel.org/netdev/net-next/c/274c4a6d529c - [net-next,resend,v1,2/2] netlink: Make use of __assign_bit() API https://git.kernel.org/netdev/net-next/c/b8e39b38487e You are awesome, thank you!
diff --git a/net/core/dev.c b/net/core/dev.c index 69a3e544676c..d6e1b786c5c5 100644 --- 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 9370fd50aa2c..ab1e8d1bd5a1 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1244,17 +1244,11 @@ int sk_setsockopt(struct sock *sk, int level, int optname, 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 @@ int sk_setsockopt(struct sock *sk, int level, int optname, 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) &&
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> --- net/core/dev.c | 8 ++------ net/core/sock.c | 15 +++------------ 2 files changed, 5 insertions(+), 18 deletions(-)