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

net: Put flowi_* prefix on AF independent members of struct flowi

Browse Source 
I intend to turn struct flowi into a union of AF specific flowi
structs.  There will be a common structure that each variant includes
first, much like struct sock_common.

This is the first step to move in that direction.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2011-03-12 00:29:39 -05:00
parent ca116922af
commit 1d28f42c1b
56 changed files with 365 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net/netfilter/ipvs/ip_vs_ctl.c
View File

@@ -76,7 +76,7 @@ static int __ip_vs_addr_is_local_v6(struct net *net,
{
struct rt6_info *rt;
struct flowi fl = {
.oif = 0,
.flowi_oif = 0,
.fl6_dst = *addr,
.fl6_src = { .s6_addr32 = {0, 0, 0, 0} },
};

2
net/netfilter/ipvs/ip_vs_xmit.c
View File

@@ -169,7 +169,7 @@ __ip_vs_reroute_locally(struct sk_buff *skb)
.fl4_dst = iph->daddr,
.fl4_src = iph->saddr,
.fl4_tos = RT_TOS(iph->tos),
.mark = skb->mark,
.flowi_mark = skb->mark,
};
rt = ip_route_output_key(net, &fl);

4
net/netfilter/xt_TEE.c
View File

@@ -68,7 +68,7 @@ tee_tg_route4(struct sk_buff *skb, const struct xt_tee_tginfo *info)
if (info->priv) {
if (info->priv->oif == -1)
return false;
fl.oif = info->priv->oif;
fl.flowi_oif = info->priv->oif;
}
fl.fl4_dst = info->gw.ip;
fl.fl4_tos = RT_TOS(iph->tos);
@@ -149,7 +149,7 @@ tee_tg_route6(struct sk_buff *skb, const struct xt_tee_tginfo *info)
if (info->priv) {
if (info->priv->oif == -1)
return false;
fl.oif = info->priv->oif;
fl.flowi_oif = info->priv->oif;
}
fl.fl6_dst = info->gw.in6;
fl.fl6_flowlabel = ((iph->flow_lbl[0] & 0xF) << 16) |