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

ipv4: Pass ipv4 flow objects into fib_lookup() paths.

Browse Source 
To start doing these conversions, we need to add some temporary
flow4_* macros which will eventually go away when all the protocol
code paths are changed to work on AF specific flowi objects.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2011-03-11 19:54:08 -05:00
parent 59b1a94c9a
commit 22bd5b9b13
7 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/ipv4/route.c
View File

@@ -1707,7 +1707,7 @@ void ip_rt_get_source(u8 *addr, struct rtable *rt)
};
rcu_read_lock();
if (fib_lookup(dev_net(rt->dst.dev), &fl, &res) == 0)
if (fib_lookup(dev_net(rt->dst.dev), &fl.u.ip4, &res) == 0)
src = FIB_RES_PREFSRC(res);
else
src = inet_select_addr(rt->dst.dev, rt->rt_gateway,
@@ -2125,7 +2125,7 @@ static int ip_route_input_slow(struct sk_buff *skb, __be32 daddr, __be32 saddr,
fl.fl4_src = saddr;
fl.fl4_tos = tos;
fl.fl4_scope = RT_SCOPE_UNIVERSE;
err = fib_lookup(net, &fl, &res);
err = fib_lookup(net, &fl.u.ip4, &res);
if (err != 0) {
if (!IN_DEV_FORWARD(in_dev))
goto e_hostunreach;
@@ -2551,7 +2551,7 @@ static struct rtable *ip_route_output_slow(struct net *net,
goto make_route;
}
if (fib_lookup(net, &fl, &res)) {
if (fib_lookup(net, &fl.u.ip4, &res)) {
res.fi = NULL;
if (oldflp->flowi_oif) {
/* Apparently, routing tables are wrong. Assume,