diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-30 15:27:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-30 15:27:11 -0500 |
commit | b3419363808f2481b24a817f491878e1795db4c7 (patch) | |
tree | 76cfa3c55d6798a9bf25d200778dc212841f6cb0 /net/ipv6 | |
parent | 672f007d65f50468a4a1e55825fe58e5b035324d (diff) |
ipv6: Add infrastructure to bind inet_peer objects to routes.
They are only allowed on cached ipv6 routes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/route.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index a0c4ad109c63..026caef0326c 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -188,11 +188,29 @@ static void ip6_dst_destroy(struct dst_entry *dst) | |||
188 | { | 188 | { |
189 | struct rt6_info *rt = (struct rt6_info *)dst; | 189 | struct rt6_info *rt = (struct rt6_info *)dst; |
190 | struct inet6_dev *idev = rt->rt6i_idev; | 190 | struct inet6_dev *idev = rt->rt6i_idev; |
191 | struct inet_peer *peer = rt->rt6i_peer; | ||
191 | 192 | ||
192 | if (idev != NULL) { | 193 | if (idev != NULL) { |
193 | rt->rt6i_idev = NULL; | 194 | rt->rt6i_idev = NULL; |
194 | in6_dev_put(idev); | 195 | in6_dev_put(idev); |
195 | } | 196 | } |
197 | if (peer) { | ||
198 | BUG_ON(!(rt->rt6i_flags & RTF_CACHE)); | ||
199 | rt->rt6i_peer = NULL; | ||
200 | inet_putpeer(peer); | ||
201 | } | ||
202 | } | ||
203 | |||
204 | void rt6_bind_peer(struct rt6_info *rt, int create) | ||
205 | { | ||
206 | struct inet_peer *peer; | ||
207 | |||
208 | if (WARN_ON(!(rt->rt6i_flags & RTF_CACHE))) | ||
209 | return; | ||
210 | |||
211 | peer = inet_getpeer_v6(&rt->rt6i_dst.addr, create); | ||
212 | if (peer && cmpxchg(&rt->rt6i_peer, NULL, peer) != NULL) | ||
213 | inet_putpeer(peer); | ||
196 | } | 214 | } |
197 | 215 | ||
198 | static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, | 216 | static void ip6_dst_ifdown(struct dst_entry *dst, struct net_device *dev, |