diff options
-rw-r--r-- | include/linux/netdevice.h | 2 | ||||
-rw-r--r-- | include/linux/rculist.h | 14 |
2 files changed, 16 insertions, 0 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 465add6c43e3..083b5989cecb 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -1079,6 +1079,8 @@ extern rwlock_t dev_base_lock; /* Device list lock */ | |||
1079 | list_for_each_entry_safe(d, n, &(net)->dev_base_head, dev_list) | 1079 | list_for_each_entry_safe(d, n, &(net)->dev_base_head, dev_list) |
1080 | #define for_each_netdev_continue(net, d) \ | 1080 | #define for_each_netdev_continue(net, d) \ |
1081 | list_for_each_entry_continue(d, &(net)->dev_base_head, dev_list) | 1081 | list_for_each_entry_continue(d, &(net)->dev_base_head, dev_list) |
1082 | #define for_each_netdev_continue_rcu(net, d) \ | ||
1083 | list_for_each_entry_continue_rcu(d, &(net)->dev_base_head, dev_list) | ||
1082 | #define net_device_entry(lh) list_entry(lh, struct net_device, dev_list) | 1084 | #define net_device_entry(lh) list_entry(lh, struct net_device, dev_list) |
1083 | 1085 | ||
1084 | static inline struct net_device *next_net_device(struct net_device *dev) | 1086 | static inline struct net_device *next_net_device(struct net_device *dev) |
diff --git a/include/linux/rculist.h b/include/linux/rculist.h index 5710f43bbc9e..1bf0f708c4fc 100644 --- a/include/linux/rculist.h +++ b/include/linux/rculist.h | |||
@@ -262,6 +262,20 @@ static inline void list_splice_init_rcu(struct list_head *list, | |||
262 | (pos) = rcu_dereference((pos)->next)) | 262 | (pos) = rcu_dereference((pos)->next)) |
263 | 263 | ||
264 | /** | 264 | /** |
265 | * list_for_each_entry_continue_rcu - continue iteration over list of given type | ||
266 | * @pos: the type * to use as a loop cursor. | ||
267 | * @head: the head for your list. | ||
268 | * @member: the name of the list_struct within the struct. | ||
269 | * | ||
270 | * Continue to iterate over list of given type, continuing after | ||
271 | * the current position. | ||
272 | */ | ||
273 | #define list_for_each_entry_continue_rcu(pos, head, member) \ | ||
274 | for (pos = list_entry_rcu(pos->member.next, typeof(*pos), member); \ | ||
275 | prefetch(pos->member.next), &pos->member != (head); \ | ||
276 | pos = list_entry_rcu(pos->member.next, typeof(*pos), member)) | ||
277 | |||
278 | /** | ||
265 | * hlist_del_rcu - deletes entry from hash list without re-initialization | 279 | * hlist_del_rcu - deletes entry from hash list without re-initialization |
266 | * @n: the element to delete from the hash list. | 280 | * @n: the element to delete from the hash list. |
267 | * | 281 | * |