xfrm: use xfrm_addr_cmp() instead of compare addresses directly
Subsystems (3)
PATCH 1/1 xfrm: use xfrm_addr_cmp() instead of compare addresses directly
Clean up to use xfrm_addr_cmp() instead of compare addresses directly.
Signed-off-by Wei Yongjun <[email protected]>
--- net/xfrm/xfrm_state.c | 57 +++++++------------------------------------------ 1 files changed, 8 insertions(+), 49 deletions(-)
net/xfrm/xfrm_state.c +8 -49
@@ -668,22 +668,10 @@ static struct xfrm_state *__xfrm_state_lookup(struct net *net, xfrm_address_t *dhlist_for_each_entry (x, entry, net->xfrm.state_byspi+h, byspi) {if (x->props.family != family || x->id.spi != spi || - x->id.proto != proto) + x->id.proto != proto || +xfrm_addr_cmp (&x->id.daddr, daddr, family))continue ; -switch (family) { -case AF_INET : -if (x->id.daddr.a4 != daddr->a4) -continue ; -break ; -case AF_INET6 : -if (!ipv6_addr_equal ((struct in6_addr *)daddr, - (struct in6_addr *) - x->id.daddr.a6)) -continue ; -break ; - } -xfrm_state_hold (x);return x; }
@@ -699,26 +687,11 @@ static struct xfrm_state *__xfrm_state_lookup_byaddr(struct net *net, xfrm_addrehlist_for_each_entry (x, entry, net->xfrm.state_bysrc+h, bysrc) {if (x->props.family != family || - x->id.proto != proto) + x->id.proto != proto || +xfrm_addr_cmp (&x->id.daddr, daddr, family) || +xfrm_addr_cmp (&x->props.saddr, saddr, family))continue ; -switch (family) { -case AF_INET : -if (x->id.daddr.a4 != daddr->a4 || - x->props.saddr.a4 != saddr->a4) -continue ; -break ; -case AF_INET6 : -if (!ipv6_addr_equal ((struct in6_addr *)daddr, - (struct in6_addr *) - x->id.daddr.a6) || - !ipv6_addr_equal ((struct in6_addr *)saddr, - (struct in6_addr *) - x->props.saddr.a6)) -continue ; -break ; - } -xfrm_state_hold (x);return x; }
@@ -1001,25 +974,11 @@ static struct xfrm_state *__find_acq_core(struct net *net, unsigned short family x->props.family != family || x->km.state !=XFRM_STATE_ACQ || x->id.spi !=0 || - x->id.proto != proto) + x->id.proto != proto || +xfrm_addr_cmp (&x->id.daddr, daddr, family) || + xfrm_addr_cmp(&x->props.saddr, saddr, family)) continue; -switch (family) { -case AF_INET : -if (x->id.daddr.a4 != daddr->a4 || - x->props.saddr.a4 != saddr->a4) -continue ; -break ; -case AF_INET6 : -if (!ipv6_addr_equal ((struct in6_addr *)x->id.daddr.a6, - (struct in6_addr *)daddr) || - !ipv6_addr_equal ((struct in6_addr *) - x->props.saddr.a6, - (struct in6_addr *)saddr)) -continue ; -break ; - } -xfrm_state_hold (x);return x; }
Signature · 1 line
1.6.2.2
Quoted 3 lines · Wei Yongjun
Clean up to use
xfrm_addr_cmp()instead of compare addresses directly.Signed-off-by Wei Yongjun <[email protected]>
Looks good to me. Thanks!
Acked-by Herbert Xu <[email protected]>
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtFrom: Wei Yongjun <[email protected]>
Date: Mon, 29 Jun 2009 12:42:53 +0800
Quoted 3 lines
Clean up to use
xfrm_addr_cmp()instead of compare addresses directly.Signed-off-by Wei Yongjun <[email protected]>
Applied.