diff options
| author | David S. Miller <davem@davemloft.net> | 2024-03-01 08:42:33 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2024-03-01 08:42:33 +0000 |
| commit | 9f780efa6eaa3870bd2ad487ee97872fe25f3e1d (patch) | |
| tree | b790be03802a14ad4f106ce7c1f221990b468dd6 /drivers | |
| parent | 65f5dd4f02a89df429b8212b4c2f3ada6c4f3fc1 (diff) | |
| parent | 2a02f8379bde89472cddb49dc8e55a17e0b68eed (diff) | |
| download | linux-9f780efa6eaa3870bd2ad487ee97872fe25f3e1d.tar.gz linux-9f780efa6eaa3870bd2ad487ee97872fe25f3e1d.tar.bz2 linux-9f780efa6eaa3870bd2ad487ee97872fe25f3e1d.zip | |
Merge branch 'ipv6-devconf-lockless'
Eric Dumazet says:
====================
ipv6: lockless accesses to devconf
- First patch puts in a cacheline_group the fields used in fast paths.
- Annotate all data races around idev->cnf fields.
- Last patch in this series removes RTNL use for RTM_GETNETCONF dumps.
v3: addressed Jakub Kicinski feedback in addrconf_disable_ipv6()
Added tags from Jiri and Florian.
v2: addressed Jiri Pirko feedback
- Added "ipv6: addrconf_disable_ipv6() optimizations"
and "ipv6: addrconf_disable_policy() optimization"
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/flower/action.c | 2 | ||||
| -rw-r--r-- | drivers/net/usb/cdc_mbim.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/flower/action.c b/drivers/net/ethernet/netronome/nfp/flower/action.c index 2b383d92d7f5..2c3f62907958 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/action.c +++ b/drivers/net/ethernet/netronome/nfp/flower/action.c @@ -460,7 +460,7 @@ nfp_fl_set_tun(struct nfp_app *app, struct nfp_fl_set_tun *set_tun, set_tun->ttl = ip6_dst_hoplimit(dst); dst_release(dst); } else { - set_tun->ttl = net->ipv6.devconf_all->hop_limit; + set_tun->ttl = READ_ONCE(net->ipv6.devconf_all->hop_limit); } #endif } else { diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c index cd4083e0b3b9..e13e4920ee9b 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c @@ -339,7 +339,7 @@ static void do_neigh_solicit(struct usbnet *dev, u8 *buf, u16 tci) in6_dev = in6_dev_get(netdev); if (!in6_dev) goto out; - is_router = !!in6_dev->cnf.forwarding; + is_router = !!READ_ONCE(in6_dev->cnf.forwarding); in6_dev_put(in6_dev); /* ipv6_stub != NULL if in6_dev_get returned an inet6_dev */ |