aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-08-24 03:13:10 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 18:08:38 -0400
commit2770834c9f44afd1bfa13914c7285470775af657 (patch)
tree40191fdc632e572bc7878f57dc8fb385109a3aa8 /include/net
parent64d9fdda8e1bdf416b2d9203c3ad9c249ea301be (diff)
[XFRM]: Pull xfrm_state_bydst hash table knowledge out of afinfo.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/xfrm.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index c75b3287d8f8..cc83443f301e 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -243,7 +243,6 @@ extern int __xfrm_state_delete(struct xfrm_state *x);
243 243
244struct xfrm_state_afinfo { 244struct xfrm_state_afinfo {
245 unsigned short family; 245 unsigned short family;
246 struct list_head *state_bydst;
247 struct list_head *state_bysrc; 246 struct list_head *state_bysrc;
248 struct list_head *state_byspi; 247 struct list_head *state_byspi;
249 int (*init_flags)(struct xfrm_state *x); 248 int (*init_flags)(struct xfrm_state *x);
@@ -252,9 +251,6 @@ struct xfrm_state_afinfo {
252 xfrm_address_t *daddr, xfrm_address_t *saddr); 251 xfrm_address_t *daddr, xfrm_address_t *saddr);
253 struct xfrm_state *(*state_lookup)(xfrm_address_t *daddr, u32 spi, u8 proto); 252 struct xfrm_state *(*state_lookup)(xfrm_address_t *daddr, u32 spi, u8 proto);
254 struct xfrm_state *(*state_lookup_byaddr)(xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto); 253 struct xfrm_state *(*state_lookup_byaddr)(xfrm_address_t *daddr, xfrm_address_t *saddr, u8 proto);
255 struct xfrm_state *(*find_acq)(u8 mode, u32 reqid, u8 proto,
256 xfrm_address_t *daddr, xfrm_address_t *saddr,
257 int create);
258 int (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n); 254 int (*tmpl_sort)(struct xfrm_tmpl **dst, struct xfrm_tmpl **src, int n);
259 int (*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n); 255 int (*state_sort)(struct xfrm_state **dst, struct xfrm_state **src, int n);
260}; 256};
@@ -456,18 +452,6 @@ unsigned __xfrm6_dst_hash(xfrm_address_t *addr)
456} 452}
457 453
458static __inline__ 454static __inline__
459unsigned xfrm_dst_hash(xfrm_address_t *addr, unsigned short family)
460{
461 switch (family) {
462 case AF_INET:
463 return __xfrm4_dst_hash(addr);
464 case AF_INET6:
465 return __xfrm6_dst_hash(addr);
466 }
467 return 0;
468}
469
470static __inline__
471unsigned __xfrm4_src_hash(xfrm_address_t *addr) 455unsigned __xfrm4_src_hash(xfrm_address_t *addr)
472{ 456{
473 return __xfrm4_dst_hash(addr); 457 return __xfrm4_dst_hash(addr);