forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
David S. Miller 2011-01-04 11:57:25 -08:00
commit dbbe68bb12
14 changed files with 87 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
net/ipv4/route.c
View file

@ -2626,8 +2626,12 @@ static int ip_route_output_slow(struct net *net, struct rtable **rp,
}
if (res.type == RTN_LOCAL) {
if (!fl.fl4_src)
fl.fl4_src = fl.fl4_dst;
if (!fl.fl4_src) {
if (res.fi->fib_prefsrc)
fl.fl4_src = res.fi->fib_prefsrc;
else
fl.fl4_src = fl.fl4_dst;
}
dev_out = net->loopback_dev;
fl.oif = dev_out->ifindex;
res.fi = NULL;