diff options
author | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
tree | cd71e597bbbe677820bb229c6aedbad412758959 /net/ipv6/ndisc.c | |
parent | d6f03f29f7cdf064289f941bf0b838348e996e65 (diff) | |
parent | fc0b927d9a5024e138c4318fe19a590f23e3eeec (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'net/ipv6/ndisc.c')
-rw-r--r-- | net/ipv6/ndisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index a4769881c5b5..2854705b15ea 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c | |||
@@ -1574,7 +1574,7 @@ void ndisc_send_redirect(struct sk_buff *skb, struct neighbour *neigh, | |||
1574 | } | 1574 | } |
1575 | if (!rt->rt6i_peer) | 1575 | if (!rt->rt6i_peer) |
1576 | rt6_bind_peer(rt, 1); | 1576 | rt6_bind_peer(rt, 1); |
1577 | if (inet_peer_xrlim_allow(rt->rt6i_peer, 1*HZ)) | 1577 | if (!inet_peer_xrlim_allow(rt->rt6i_peer, 1*HZ)) |
1578 | goto release; | 1578 | goto release; |
1579 | 1579 | ||
1580 | if (dev->addr_len) { | 1580 | if (dev->addr_len) { |