summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorJamal Hadi Salim <hadi@cyberus.ca>2007-05-04 12:55:13 -0700
committerDavid S. Miller <davem@davemloft.net>2007-05-04 12:55:13 -0700
commitaf11e31609d93765c1b22611592543e028f7aa54 (patch)
treef8a915dc7d98844667308f7c234d00f59113ff3f /include/net
parent224711df5c00f7540b89f32a8225866031977f17 (diff)
downloadlinux-af11e31609d93765c1b22611592543e028f7aa54.tar.gz
linux-af11e31609d93765c1b22611592543e028f7aa54.tar.bz2
linux-af11e31609d93765c1b22611592543e028f7aa54.zip
[XFRM] SAD info TLV aggregationx
Aggregate the SAD info TLVs. Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/xfrm.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 66c2d3eec03c..d0d7db51d3fc 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -416,14 +416,6 @@ struct xfrm_audit
u32 secid;
};
-/* SAD metadata, add more later */
-struct xfrm_sadinfo
-{
- u32 sadhcnt; /* current hash bkts */
- u32 sadhmcnt; /* max allowed hash bkts */
- u32 sadcnt; /* current running count */
-};
-
struct xfrm_spdinfo
{
u32 incnt;
@@ -964,10 +956,17 @@ static inline int xfrm_state_sort(struct xfrm_state **dst, struct xfrm_state **s
return -ENOSYS;
}
#endif
+
+struct xfrmk_sadinfo {
+ u32 sadhcnt; /* current hash bkts */
+ u32 sadhmcnt; /* max allowed hash bkts */
+ u32 sadcnt; /* current running count */
+};
+
extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq);
extern int xfrm_state_delete(struct xfrm_state *x);
extern void xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info);
-extern void xfrm_sad_getinfo(struct xfrm_sadinfo *si);
+extern void xfrm_sad_getinfo(struct xfrmk_sadinfo *si);
extern void xfrm_spd_getinfo(struct xfrm_spdinfo *si);
extern int xfrm_replay_check(struct xfrm_state *x, __be32 seq);
extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq);