diff options
author | David S. Miller <davem@davemloft.net> | 2012-07-10 06:58:16 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-11 01:40:11 -0400 |
commit | 1d861aa4b3fb08822055345f480850205ffe6170 (patch) | |
tree | 072c23dcde7766274464c75e51e820649301ad82 /net/ipv6/ip6_output.c | |
parent | 16d1839907e695387654901995f9286b65fbbc6a (diff) |
inet: Minimize use of cached route inetpeer.
Only use it in the absolutely required cases:
1) COW'ing metrics
2) ipv4 PMTU
3) ipv4 redirects
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/ip6_output.c')
-rw-r--r-- | net/ipv6/ip6_output.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index c6af5963a202..5b2d63ed793e 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c | |||
@@ -466,13 +466,15 @@ int ip6_forward(struct sk_buff *skb) | |||
466 | else | 466 | else |
467 | target = &hdr->daddr; | 467 | target = &hdr->daddr; |
468 | 468 | ||
469 | peer = rt6_get_peer_create(rt); | 469 | peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1); |
470 | 470 | ||
471 | /* Limit redirects both by destination (here) | 471 | /* Limit redirects both by destination (here) |
472 | and by source (inside ndisc_send_redirect) | 472 | and by source (inside ndisc_send_redirect) |
473 | */ | 473 | */ |
474 | if (inet_peer_xrlim_allow(peer, 1*HZ)) | 474 | if (inet_peer_xrlim_allow(peer, 1*HZ)) |
475 | ndisc_send_redirect(skb, target); | 475 | ndisc_send_redirect(skb, target); |
476 | if (peer) | ||
477 | inet_putpeer(peer); | ||
476 | } else { | 478 | } else { |
477 | int addrtype = ipv6_addr_type(&hdr->saddr); | 479 | int addrtype = ipv6_addr_type(&hdr->saddr); |
478 | 480 | ||
@@ -592,10 +594,14 @@ void ipv6_select_ident(struct frag_hdr *fhdr, struct rt6_info *rt) | |||
592 | int old, new; | 594 | int old, new; |
593 | 595 | ||
594 | if (rt && !(rt->dst.flags & DST_NOPEER)) { | 596 | if (rt && !(rt->dst.flags & DST_NOPEER)) { |
595 | struct inet_peer *peer = rt6_get_peer_create(rt); | 597 | struct inet_peer *peer; |
598 | struct net *net; | ||
596 | 599 | ||
600 | net = dev_net(rt->dst.dev); | ||
601 | peer = inet_getpeer_v6(net->ipv6.peers, &rt->rt6i_dst.addr, 1); | ||
597 | if (peer) { | 602 | if (peer) { |
598 | fhdr->identification = htonl(inet_getid(peer, 0)); | 603 | fhdr->identification = htonl(inet_getid(peer, 0)); |
604 | inet_putpeer(peer); | ||
599 | return; | 605 | return; |
600 | } | 606 | } |
601 | } | 607 | } |