projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net: Put fl6_* macros to struct flowi6 and use them again.
[deliverable/linux.git]
/
net
/
ipv6
/
mip6.c
diff --git
a/net/ipv6/mip6.c
b/net/ipv6/mip6.c
index d6e9599d0705a5b79749a0566cbd97dfaa9993c0..9b210482fb056693b7f926a80468d0932e144171 100644
(file)
--- a/
net/ipv6/mip6.c
+++ b/
net/ipv6/mip6.c
@@
-203,18
+203,20
@@
static inline int mip6_report_rl_allow(struct timeval *stamp,
return allow;
}
return allow;
}
-static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb, struct flowi *fl)
+static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb,
+ const struct flowi *fl)
{
struct net *net = xs_net(x);
struct inet6_skb_parm *opt = (struct inet6_skb_parm *)skb->cb;
{
struct net *net = xs_net(x);
struct inet6_skb_parm *opt = (struct inet6_skb_parm *)skb->cb;
+ const struct flowi6 *fl6 = &fl->u.ip6;
struct ipv6_destopt_hao *hao = NULL;
struct xfrm_selector sel;
int offset;
struct timeval stamp;
int err = 0;
struct ipv6_destopt_hao *hao = NULL;
struct xfrm_selector sel;
int offset;
struct timeval stamp;
int err = 0;
- if (unlikely(fl
->
proto == IPPROTO_MH &&
- fl
->fl
_mh_type <= IP6_MH_TYPE_MAX))
+ if (unlikely(fl
6->flowi6_
proto == IPPROTO_MH &&
+ fl
6->fl6
_mh_type <= IP6_MH_TYPE_MAX))
goto out;
if (likely(opt->dsthao)) {
goto out;
if (likely(opt->dsthao)) {
@@
-239,14
+241,14
@@
static int mip6_destopt_reject(struct xfrm_state *x, struct sk_buff *skb, struct
sizeof(sel.saddr));
sel.prefixlen_s = 128;
sel.family = AF_INET6;
sizeof(sel.saddr));
sel.prefixlen_s = 128;
sel.family = AF_INET6;
- sel.proto = fl
->
proto;
- sel.dport = xfrm_flowi_dport(fl);
+ sel.proto = fl
6->flowi6_
proto;
+ sel.dport = xfrm_flowi_dport(fl
, &fl6->uli
);
if (sel.dport)
sel.dport_mask = htons(~0);
if (sel.dport)
sel.dport_mask = htons(~0);
- sel.sport = xfrm_flowi_sport(fl);
+ sel.sport = xfrm_flowi_sport(fl
, &fl6->uli
);
if (sel.sport)
sel.sport_mask = htons(~0);
if (sel.sport)
sel.sport_mask = htons(~0);
- sel.ifindex = fl
->
oif;
+ sel.ifindex = fl
6->flowi6_
oif;
err = km_report(net, IPPROTO_DSTOPTS, &sel,
(hao ? (xfrm_address_t *)&hao->addr : NULL));
err = km_report(net, IPPROTO_DSTOPTS, &sel,
(hao ? (xfrm_address_t *)&hao->addr : NULL));
This page took
0.031497 seconds
and
5
git commands to generate.