diff options
author | David S. Miller <davem@davemloft.net> | 2011-03-12 00:44:35 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-03-12 18:08:46 -0500 |
commit | 56bb8059e1a8bf291054c26367564dc302f6fd8f (patch) | |
tree | 56ec5ae2c1856208ccf97a0cd6b21ab0587f34cf /net/ipv6/mip6.c | |
parent | 6281dcc94a96bd73017b2baa8fa83925405109ef (diff) |
net: Break struct flowi out into AF specific instances.
Now we have struct flowi4, flowi6, and flowidn for each address
family. And struct flowi is just a union of them all.
It might have been troublesome to convert flow_cache_uli_match() but
as it turns out this function is completely unused and therefore can
be simply removed.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/mip6.c')
-rw-r--r-- | net/ipv6/mip6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/mip6.c b/net/ipv6/mip6.c index 5038e6b2b55b..e1767aec3334 100644 --- a/net/ipv6/mip6.c +++ b/net/ipv6/mip6.c | |||
@@ -241,10 +241,10 @@ static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb, | |||
241 | sel.prefixlen_s = 128; | 241 | sel.prefixlen_s = 128; |
242 | sel.family = AF_INET6; | 242 | sel.family = AF_INET6; |
243 | sel.proto = fl->flowi_proto; | 243 | sel.proto = fl->flowi_proto; |
244 | sel.dport = xfrm_flowi_dport(fl, &fl->uli_u); | 244 | sel.dport = xfrm_flowi_dport(fl, &fl->u.ip6.uli); |
245 | if (sel.dport) | 245 | if (sel.dport) |
246 | sel.dport_mask = htons(~0); | 246 | sel.dport_mask = htons(~0); |
247 | sel.sport = xfrm_flowi_sport(fl, &fl->uli_u); | 247 | sel.sport = xfrm_flowi_sport(fl, &fl->u.ip6.uli); |
248 | if (sel.sport) | 248 | if (sel.sport) |
249 | sel.sport_mask = htons(~0); | 249 | sel.sport_mask = htons(~0); |
250 | sel.ifindex = fl->flowi_oif; | 250 | sel.ifindex = fl->flowi_oif; |