diff options
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 9428766d0140..d22ffd722ee3 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -2673,13 +2673,13 @@ static int get_rps_cpu(struct net_device *dev, struct sk_buff *skb, | |||
2673 | map = rcu_dereference(rxqueue->rps_map); | 2673 | map = rcu_dereference(rxqueue->rps_map); |
2674 | if (map) { | 2674 | if (map) { |
2675 | if (map->len == 1 && | 2675 | if (map->len == 1 && |
2676 | !rcu_dereference_raw(rxqueue->rps_flow_table)) { | 2676 | !rcu_access_pointer(rxqueue->rps_flow_table)) { |
2677 | tcpu = map->cpus[0]; | 2677 | tcpu = map->cpus[0]; |
2678 | if (cpu_online(tcpu)) | 2678 | if (cpu_online(tcpu)) |
2679 | cpu = tcpu; | 2679 | cpu = tcpu; |
2680 | goto done; | 2680 | goto done; |
2681 | } | 2681 | } |
2682 | } else if (!rcu_dereference_raw(rxqueue->rps_flow_table)) { | 2682 | } else if (!rcu_access_pointer(rxqueue->rps_flow_table)) { |
2683 | goto done; | 2683 | goto done; |
2684 | } | 2684 | } |
2685 | 2685 | ||
@@ -5727,8 +5727,8 @@ void netdev_run_todo(void) | |||
5727 | 5727 | ||
5728 | /* paranoia */ | 5728 | /* paranoia */ |
5729 | BUG_ON(netdev_refcnt_read(dev)); | 5729 | BUG_ON(netdev_refcnt_read(dev)); |
5730 | WARN_ON(rcu_dereference_raw(dev->ip_ptr)); | 5730 | WARN_ON(rcu_access_pointer(dev->ip_ptr)); |
5731 | WARN_ON(rcu_dereference_raw(dev->ip6_ptr)); | 5731 | WARN_ON(rcu_access_pointer(dev->ip6_ptr)); |
5732 | WARN_ON(dev->dn_ptr); | 5732 | WARN_ON(dev->dn_ptr); |
5733 | 5733 | ||
5734 | if (dev->destructor) | 5734 | if (dev->destructor) |
@@ -5932,7 +5932,7 @@ void free_netdev(struct net_device *dev) | |||
5932 | kfree(dev->_rx); | 5932 | kfree(dev->_rx); |
5933 | #endif | 5933 | #endif |
5934 | 5934 | ||
5935 | kfree(rcu_dereference_raw(dev->ingress_queue)); | 5935 | kfree(rcu_dereference_protected(dev->ingress_queue, 1)); |
5936 | 5936 | ||
5937 | /* Flush device addresses */ | 5937 | /* Flush device addresses */ |
5938 | dev_addr_flush(dev); | 5938 | dev_addr_flush(dev); |