diff options
Diffstat (limited to 'net/ipv6/tunnel6.c')
-rw-r--r-- | net/ipv6/tunnel6.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/ipv6/tunnel6.c b/net/ipv6/tunnel6.c index d203e6df1f8b..3177fe0459e0 100644 --- a/net/ipv6/tunnel6.c +++ b/net/ipv6/tunnel6.c | |||
@@ -88,6 +88,11 @@ int xfrm6_tunnel_deregister(struct xfrm6_tunnel *handler, unsigned short family) | |||
88 | 88 | ||
89 | EXPORT_SYMBOL(xfrm6_tunnel_deregister); | 89 | EXPORT_SYMBOL(xfrm6_tunnel_deregister); |
90 | 90 | ||
91 | #define for_each_tunnel_rcu(head, handler) \ | ||
92 | for (handler = rcu_dereference(head); \ | ||
93 | handler != NULL; \ | ||
94 | handler = rcu_dereference(handler->next)) \ | ||
95 | |||
91 | static int tunnel6_rcv(struct sk_buff *skb) | 96 | static int tunnel6_rcv(struct sk_buff *skb) |
92 | { | 97 | { |
93 | struct xfrm6_tunnel *handler; | 98 | struct xfrm6_tunnel *handler; |
@@ -95,7 +100,7 @@ static int tunnel6_rcv(struct sk_buff *skb) | |||
95 | if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) | 100 | if (!pskb_may_pull(skb, sizeof(struct ipv6hdr))) |
96 | goto drop; | 101 | goto drop; |
97 | 102 | ||
98 | for (handler = tunnel6_handlers; handler; handler = handler->next) | 103 | for_each_tunnel_rcu(tunnel6_handlers, handler) |
99 | if (!handler->handler(skb)) | 104 | if (!handler->handler(skb)) |
100 | return 0; | 105 | return 0; |
101 | 106 | ||
@@ -113,7 +118,7 @@ static int tunnel46_rcv(struct sk_buff *skb) | |||
113 | if (!pskb_may_pull(skb, sizeof(struct iphdr))) | 118 | if (!pskb_may_pull(skb, sizeof(struct iphdr))) |
114 | goto drop; | 119 | goto drop; |
115 | 120 | ||
116 | for (handler = tunnel46_handlers; handler; handler = handler->next) | 121 | for_each_tunnel_rcu(tunnel46_handlers, handler) |
117 | if (!handler->handler(skb)) | 122 | if (!handler->handler(skb)) |
118 | return 0; | 123 | return 0; |
119 | 124 | ||
@@ -129,7 +134,7 @@ static void tunnel6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | |||
129 | { | 134 | { |
130 | struct xfrm6_tunnel *handler; | 135 | struct xfrm6_tunnel *handler; |
131 | 136 | ||
132 | for (handler = tunnel6_handlers; handler; handler = handler->next) | 137 | for_each_tunnel_rcu(tunnel6_handlers, handler) |
133 | if (!handler->err_handler(skb, opt, type, code, offset, info)) | 138 | if (!handler->err_handler(skb, opt, type, code, offset, info)) |
134 | break; | 139 | break; |
135 | } | 140 | } |