summaryrefslogtreecommitdiff
path: root/include/linux/netdevice.h
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-10-25 03:02:02 +0000
committerDavid S. Miller <davem@davemloft.net>2010-10-25 14:18:27 -0700
commit6e3f7faf3e8a3e226b1a6b955aac12abf2f2e1b6 (patch)
treea2ff2fe9f86ff561d62ceac56e8fe18d7b6f14a0 /include/linux/netdevice.h
parentf6318e558806c925029dc101f14874be9f9fa78f (diff)
downloadlwn-6e3f7faf3e8a3e226b1a6b955aac12abf2f2e1b6.tar.gz
lwn-6e3f7faf3e8a3e226b1a6b955aac12abf2f2e1b6.zip
rps: add __rcu annotations
Add __rcu annotations to : (struct netdev_rx_queue)->rps_map (struct netdev_rx_queue)->rps_flow_table struct rps_sock_flow_table *rps_sock_flow_table; And use appropriate rcu primitives. Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netdevice.h')
-rw-r--r--include/linux/netdevice.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index b72d5a460903..072652d94d9f 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -585,15 +585,15 @@ static inline void rps_reset_sock_flow(struct rps_sock_flow_table *table,
table->ents[hash & table->mask] = RPS_NO_CPU;
}
-extern struct rps_sock_flow_table *rps_sock_flow_table;
+extern struct rps_sock_flow_table __rcu *rps_sock_flow_table;
/* This structure contains an instance of an RX queue. */
struct netdev_rx_queue {
- struct rps_map *rps_map;
- struct rps_dev_flow_table *rps_flow_table;
- struct kobject kobj;
- struct netdev_rx_queue *first;
- atomic_t count;
+ struct rps_map __rcu *rps_map;
+ struct rps_dev_flow_table __rcu *rps_flow_table;
+ struct kobject kobj;
+ struct netdev_rx_queue *first;
+ atomic_t count;
} ____cacheline_aligned_in_smp;
#endif /* CONFIG_RPS */