mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
net: Make flowi ports AF dependent.
Create two sets of port member accessors, one set prefixed by fl4_* and the other prefixed by fl6_* This will let us to create AF optimal flow instances. It will work because every context in which we access the ports, we have to be fully aware of which AF the flowi is anyways. Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
parent
08704bcbf0
commit
6281dcc94a
28 changed files with 139 additions and 129 deletions
|
|
@ -61,8 +61,8 @@ __xfrm4_selector_match(const struct xfrm_selector *sel, const struct flowi *fl)
|
|||
{
|
||||
return addr_match(&fl->fl4_dst, &sel->daddr, sel->prefixlen_d) &&
|
||||
addr_match(&fl->fl4_src, &sel->saddr, sel->prefixlen_s) &&
|
||||
!((xfrm_flowi_dport(fl) ^ sel->dport) & sel->dport_mask) &&
|
||||
!((xfrm_flowi_sport(fl) ^ sel->sport) & sel->sport_mask) &&
|
||||
!((xfrm_flowi_dport(fl, &fl->uli_u) ^ sel->dport) & sel->dport_mask) &&
|
||||
!((xfrm_flowi_sport(fl, &fl->uli_u) ^ sel->sport) & sel->sport_mask) &&
|
||||
(fl->flowi_proto == sel->proto || !sel->proto) &&
|
||||
(fl->flowi_oif == sel->ifindex || !sel->ifindex);
|
||||
}
|
||||
|
|
@ -72,8 +72,8 @@ __xfrm6_selector_match(const struct xfrm_selector *sel, const struct flowi *fl)
|
|||
{
|
||||
return addr_match(&fl->fl6_dst, &sel->daddr, sel->prefixlen_d) &&
|
||||
addr_match(&fl->fl6_src, &sel->saddr, sel->prefixlen_s) &&
|
||||
!((xfrm_flowi_dport(fl) ^ sel->dport) & sel->dport_mask) &&
|
||||
!((xfrm_flowi_sport(fl) ^ sel->sport) & sel->sport_mask) &&
|
||||
!((xfrm_flowi_dport(fl, &fl->uli_u) ^ sel->dport) & sel->dport_mask) &&
|
||||
!((xfrm_flowi_sport(fl, &fl->uli_u) ^ sel->sport) & sel->sport_mask) &&
|
||||
(fl->flowi_proto == sel->proto || !sel->proto) &&
|
||||
(fl->flowi_oif == sel->ifindex || !sel->ifindex);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue