diff options
| author | David S. Miller <davem@davemloft.net> | 2020-05-27 01:19:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-05-27 01:19:29 +0300 |
| commit | fb8ddaa915395c97f234340f465a4c424a7be090 (patch) | |
| tree | ecadbe045581025d5f87800df75ce4ad6d86eb95 /net/batman-adv/gateway_client.c | |
| parent | 6a862a44fd0c963f1bcb2ac9299609e1d8c011c2 (diff) | |
| parent | 9ad346c90509ebd983f60da7d082f261ad329507 (diff) | |
| download | linux-fb8ddaa915395c97f234340f465a4c424a7be090.tar.xz | |
Merge tag 'batadv-next-for-davem-20200526' of git://git.open-mesh.org/linux-merge
Simon Wunderlich says:
====================
This cleanup patchset includes the following patches:
- Fix revert dynamic lockdep key changes for batman-adv,
by Sven Eckelmann
- use rcu_replace_pointer() where appropriate, by Antonio Quartulli
- Revert "disable ethtool link speed detection when auto negotiation
off", by Sven Eckelmann
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/batman-adv/gateway_client.c')
| -rw-r--r-- | net/batman-adv/gateway_client.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index e22e49289677..a18dcc686dc3 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -146,8 +146,8 @@ static void batadv_gw_select(struct batadv_priv *bat_priv, if (new_gw_node) kref_get(&new_gw_node->refcount); - curr_gw_node = rcu_dereference_protected(bat_priv->gw.curr_gw, 1); - rcu_assign_pointer(bat_priv->gw.curr_gw, new_gw_node); + curr_gw_node = rcu_replace_pointer(bat_priv->gw.curr_gw, new_gw_node, + true); if (curr_gw_node) batadv_gw_node_put(curr_gw_node); |