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

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:
	net/ipv4/fib_frontend.c
This commit is contained in:
David S. Miller
2010-12-26 22:37:05 -08:00
parent 041110a439 d7c1255a3a
commit 17f7f4d9fc
1401 changed files with 22733 additions and 12093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
net/ipv4/route.c
View File

@@ -2562,9 +2562,10 @@ static int ip_route_output_slow(struct net *net, struct rtable **rp,
goto out;
/* RACE: Check return value of inet_select_addr instead. */
if (rcu_dereference(dev_out->ip_ptr) == NULL)
goto out; /* Wrong error code */
if (!(dev_out->flags & IFF_UP) || !__in_dev_get_rcu(dev_out)) {
err = -ENETUNREACH;
goto out;
}
if (ipv4_is_local_multicast(oldflp->fl4_dst) ||
ipv4_is_lbcast(oldflp->fl4_dst)) {
if (!fl.fl4_src)