lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Conflicts:
	net/ipv4/inet_diag.c
This commit is contained in:
David S. Miller
2011-11-26 14:47:03 -05:00
parent d6f03f29f7 fc0b927d9a
commit 6dec4ac4ee
42 changed files with 162 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/ipv6/ndisc.c
View File

@@ -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) {