diff options
| author |   Eric Dumazet <edumazet@google.com> | 2019-03-22 08:56:38 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-03-23 21:57:38 -0400 |
| commit | dc05360fee660a9dbe59824b3f7896534210432b (patch) | |
| tree | fa8642f7e29d461bbdd900e86a5d85e131421879 /include | |
| parent | Merge branch 'net-dev-BYPASS-for-lockless-qdisc' (diff) | |
| download | linux-dev-dc05360fee660a9dbe59824b3f7896534210432b.tar.xz linux-dev-dc05360fee660a9dbe59824b3f7896534210432b.zip | |
net: convert rps_needed and rfs_needed to new static branch api
We prefer static_branch_unlikely() over static_key_false() these days.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 4 | ||||
| -rw-r--r-- | include/net/sock.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 823762291ebf..166fdc0a78b4 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -194,8 +194,8 @@ struct net_device_stats { #ifdef CONFIG_RPS #include <linux/static_key.h> -extern struct static_key rps_needed; -extern struct static_key rfs_needed; +extern struct static_key_false rps_needed; +extern struct static_key_false rfs_needed; #endif struct neighbour; diff --git a/include/net/sock.h b/include/net/sock.h index 8de5ee258b93..fecdf639225c 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -966,7 +966,7 @@ static inline void sock_rps_record_flow_hash(__u32 hash) static inline void sock_rps_record_flow(const struct sock *sk) { #ifdef CONFIG_RPS - if (static_key_false(&rfs_needed)) { + if (static_branch_unlikely(&rfs_needed)) { /* Reading sk->sk_rxhash might incur an expensive cache line * miss. * |