aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>2013-01-30 04:27:52 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-30 22:41:13 -0500
commit18367681a10bd29c3f2305e6b7b984de5b33d548 (patch)
tree9c651ed8531fef6c7985548330cbe69576e0eb41 /include
parentd3aedd5ebd4b0b925b0bcda548066803e1318499 (diff)
ipv6 flowlabel: Convert np->ipv6_fl_list to RCU.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/ipv6.h2
-rw-r--r--include/net/ipv6.h1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index e971e3742172..850e95bc766c 100644
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -214,7 +214,7 @@ struct ipv6_pinfo {
214 214
215 struct ipv6_mc_socklist __rcu *ipv6_mc_list; 215 struct ipv6_mc_socklist __rcu *ipv6_mc_list;
216 struct ipv6_ac_socklist *ipv6_ac_list; 216 struct ipv6_ac_socklist *ipv6_ac_list;
217 struct ipv6_fl_socklist *ipv6_fl_list; 217 struct ipv6_fl_socklist __rcu *ipv6_fl_list;
218 218
219 struct ipv6_txoptions *opt; 219 struct ipv6_txoptions *opt;
220 struct sk_buff *pktoptions; 220 struct sk_buff *pktoptions;
diff --git a/include/net/ipv6.h b/include/net/ipv6.h
index 1d457161def2..851d5412a299 100644
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
@@ -239,6 +239,7 @@ struct ip6_flowlabel {
239struct ipv6_fl_socklist { 239struct ipv6_fl_socklist {
240 struct ipv6_fl_socklist *next; 240 struct ipv6_fl_socklist *next;
241 struct ip6_flowlabel *fl; 241 struct ip6_flowlabel *fl;
242 struct rcu_head rcu;
242}; 243};
243 244
244extern struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label); 245extern struct ip6_flowlabel *fl6_sock_lookup(struct sock *sk, __be32 label);