diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-10-24 21:33:16 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-10-25 13:09:45 -0700 |
| commit | 6f0bcf152582e7403155627a38e07bf3ef7f3cf5 (patch) | |
| tree | 0dafb9ea61fa01bb8850ee2bcce97b98c23a7c8f /include/net | |
| parent | 3cc77ec74e1583b50b8405114cdbd6b8ebb8c474 (diff) | |
tunnels: add _rcu annotations
(struct ip6_tnl)->next is rcu protected :
(struct ip_tunnel)->next is rcu protected :
(struct xfrm6_tunnel)->next is rcu protected :
add __rcu annotation and proper rcu primitives.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip6_tunnel.h | 2 | ||||
| -rw-r--r-- | include/net/ipip.h | 2 | ||||
| -rw-r--r-- | include/net/xfrm.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index fc94ec568a5..fc73e667b50 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h @@ -13,7 +13,7 @@ /* IPv6 tunnel */ struct ip6_tnl { - struct ip6_tnl *next; /* next tunnel in list */ + struct ip6_tnl __rcu *next; /* next tunnel in list */ struct net_device *dev; /* virtual device associated with tunnel */ struct ip6_tnl_parm parms; /* tunnel configuration parameters */ struct flowi fl; /* flowi template for xmit */ diff --git a/include/net/ipip.h b/include/net/ipip.h index 58abbf966b0..0403fe4c451 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h @@ -16,7 +16,7 @@ struct ip_tunnel_6rd_parm { }; struct ip_tunnel { - struct ip_tunnel *next; + struct ip_tunnel __rcu *next; struct net_device *dev; int err_count; /* Number of arrived ICMP errors */ diff --git a/include/net/xfrm.h b/include/net/xfrm.h index f28d7c9b9f8..ffcd47820a5 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1272,7 +1272,7 @@ struct xfrm6_tunnel { int (*handler)(struct sk_buff *skb); int (*err_handler)(struct sk_buff *skb, struct inet6_skb_parm *opt, u8 type, u8 code, int offset, __be32 info); - struct xfrm6_tunnel *next; + struct xfrm6_tunnel __rcu *next; int priority; }; |