diff options
author | David S. Miller | 2011-11-26 20:47:03 +0100 |
---|---|---|
committer | David S. Miller | 2011-11-26 20:47:03 +0100 |
commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
tree | cd71e597bbbe677820bb229c6aedbad412758959 /net/ipv6/ndisc.c | |
parent | Merge branch 'for_david' of git://git.open-mesh.org/linux-merge (diff) | |
parent | net: Revert ARCNET and PHYLIB to tristate options (diff) | |
download | kernel-qcow2-linux-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.tar.gz kernel-qcow2-linux-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.tar.xz kernel-qcow2-linux-6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c.zip |
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, } if (!rt->rt6i_peer) rt6_bind_peer(rt, 1); - if (inet_peer_xrlim_allow(rt->rt6i_peer, 1*HZ)) + if (!inet_peer_xrlim_allow(rt->rt6i_peer, 1*HZ)) goto release; if (dev->addr_len) { |