aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMasahide NAKAMURA <nakam@linux-ipv6.org>2006-09-22 18:06:24 -0400
committerDavid S. Miller <davem@davemloft.net>2006-09-22 18:06:24 -0400
commit5794708f11551b6d19b10673abf4b0202f66b44d (patch)
tree60d954e185dd80af7e6c08608fd0528cf21a5d41 /net
parent7e49e6de30efa716614e280d97963c570f3acf29 (diff)
[XFRM]: Introduce a helper to compare id protocol.
Put the helper to header for future use. Based on MIPL2 kernel patch. Signed-off-by: Masahide NAKAMURA <nakam@linux-ipv6.org> Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_state.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 1c796087ee78..34c038cbdf46 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -294,7 +294,7 @@ void xfrm_state_flush(u8 proto)
294restart: 294restart:
295 list_for_each_entry(x, xfrm_state_bydst+i, bydst) { 295 list_for_each_entry(x, xfrm_state_bydst+i, bydst) {
296 if (!xfrm_state_kern(x) && 296 if (!xfrm_state_kern(x) &&
297 (proto == IPSEC_PROTO_ANY || x->id.proto == proto)) { 297 xfrm_id_proto_match(x->id.proto, proto)) {
298 xfrm_state_hold(x); 298 xfrm_state_hold(x);
299 spin_unlock_bh(&xfrm_state_lock); 299 spin_unlock_bh(&xfrm_state_lock);
300 300
@@ -772,7 +772,7 @@ int xfrm_state_walk(u8 proto, int (*func)(struct xfrm_state *, int, void*),
772 spin_lock_bh(&xfrm_state_lock); 772 spin_lock_bh(&xfrm_state_lock);
773 for (i = 0; i < XFRM_DST_HSIZE; i++) { 773 for (i = 0; i < XFRM_DST_HSIZE; i++) {
774 list_for_each_entry(x, xfrm_state_bydst+i, bydst) { 774 list_for_each_entry(x, xfrm_state_bydst+i, bydst) {
775 if (proto == IPSEC_PROTO_ANY || x->id.proto == proto) 775 if (xfrm_id_proto_match(x->id.proto, proto))
776 count++; 776 count++;
777 } 777 }
778 } 778 }
@@ -783,7 +783,7 @@ int xfrm_state_walk(u8 proto, int (*func)(struct xfrm_state *, int, void*),
783 783
784 for (i = 0; i < XFRM_DST_HSIZE; i++) { 784 for (i = 0; i < XFRM_DST_HSIZE; i++) {
785 list_for_each_entry(x, xfrm_state_bydst+i, bydst) { 785 list_for_each_entry(x, xfrm_state_bydst+i, bydst) {
786 if (proto != IPSEC_PROTO_ANY && x->id.proto != proto) 786 if (!xfrm_id_proto_match(x->id.proto, proto))
787 continue; 787 continue;
788 err = func(x, --count, data); 788 err = func(x, --count, data);
789 if (err) 789 if (err)