Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipv4: Use flowi4 in ipmr code.

Browse Source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-03-12 02:04:50 -05:00
parent 9ade22861f
commit da91981bee
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
net/ipv4/ipmr.c
View File

@ -148,14 +148,15 @@ static struct mr_table *ipmr_get_table(struct net *net, u32 id)
return NULL; return NULL;
} }
static int ipmr_fib_lookup(struct net *net, struct flowi *flp, static int ipmr_fib_lookup(struct net *net, struct flowi4 *flp4,
struct mr_table **mrt) struct mr_table **mrt)
{ {
struct ipmr_result res; struct ipmr_result res;
struct fib_lookup_arg arg = { .result = &res, }; struct fib_lookup_arg arg = { .result = &res, };
int err; int err;
err = fib_rules_lookup(net->ipv4.mr_rules_ops, flp, 0, &arg); err = fib_rules_lookup(net->ipv4.mr_rules_ops,
flowi4_to_flowi(flp4), 0, &arg);
if (err < 0) if (err < 0)
return err; return err;
*mrt = res.mrt; *mrt = res.mrt;
@ -283,7 +284,7 @@ static struct mr_table *ipmr_get_table(struct net *net, u32 id)
return net->ipv4.mrt; return net->ipv4.mrt;
} }
static int ipmr_fib_lookup(struct net *net, struct flowi *flp, static int ipmr_fib_lookup(struct net *net, struct flowi4 *flp4,
struct mr_table **mrt) struct mr_table **mrt)
{ {
*mrt = net->ipv4.mrt; *mrt = net->ipv4.mrt;
@ -435,14 +436,14 @@ static netdev_tx_t reg_vif_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
struct net *net = dev_net(dev); struct net *net = dev_net(dev);
struct mr_table *mrt; struct mr_table *mrt;
struct flowi fl = { struct flowi4 fl4 = {
.flowi_oif = dev->ifindex, .flowi4_oif = dev->ifindex,
.flowi_iif = skb->skb_iif, .flowi4_iif = skb->skb_iif,
.flowi_mark = skb->mark, .flowi4_mark = skb->mark,
}; };
int err; int err;
err = ipmr_fib_lookup(net, &fl, &mrt); err = ipmr_fib_lookup(net, &fl4, &mrt);
if (err < 0) { if (err < 0) {
kfree_skb(skb); kfree_skb(skb);
return err; return err;
@ -1789,18 +1790,18 @@ dont_forward:
static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct rtable *rt) static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct rtable *rt)
{ {
struct flowi fl = { struct flowi4 fl4 = {
.fl4_dst = rt->rt_key_dst, .daddr = rt->rt_key_dst,
.fl4_src = rt->rt_key_src, .saddr = rt->rt_key_src,
.fl4_tos = rt->rt_tos, .flowi4_tos = rt->rt_tos,
.flowi_oif = rt->rt_oif, .flowi4_oif = rt->rt_oif,
.flowi_iif = rt->rt_iif, .flowi4_iif = rt->rt_iif,
.flowi_mark = rt->rt_mark, .flowi4_mark = rt->rt_mark,
}; };
struct mr_table *mrt; struct mr_table *mrt;
int err; int err;
err = ipmr_fib_lookup(net, &fl, &mrt); err = ipmr_fib_lookup(net, &fl4, &mrt);
if (err) if (err)
return ERR_PTR(err); return ERR_PTR(err);
return mrt; return mrt;