[XFRM]: Pull xfrm_state_by{spi,src} hash table knowledge out of afinfo.

[mirror_ubuntu-artful-kernel.git] / net / ipv4 / xfrm4_state.c

diff --git a/net/ipv4/xfrm4_state.c b/net/ipv4/xfrm4_state.c
index 9dc1afc17b6dbb8cb206625e12948d7c6d7e78b1..6a2a4ab42772a00bd2978b93dd2de07fac3976b9 100644 (file)
--- a/net/ipv4/xfrm4_state.c
+++ b/net/ipv4/xfrm4_state.c
@@ -62,38 +62,10 @@ __xfrm4_init_tempsel(struct xfrm_state *x, struct flowi *fl,
        x->props.family = AF_INET;
 }
 
-static struct xfrm_state *
-__xfrm4_state_lookup(xfrm_address_t *daddr, u32 spi, u8 proto)
-{
-       unsigned h = __xfrm4_spi_hash(daddr, spi, proto);
-       struct xfrm_state *x;
-
-       list_for_each_entry(x, xfrm4_state_afinfo.state_byspi+h, byspi) {
-               if (x->props.family == AF_INET &&
-                   spi == x->id.spi &&
-                   daddr->a4 == x->id.daddr.a4 &&
-                   proto == x->id.proto) {
-                       xfrm_state_hold(x);
-                       return x;
-               }
-       }
-       return NULL;
-}
-
-/* placeholder until ipv4's code is written */
-static struct xfrm_state *
-__xfrm4_state_lookup_byaddr(xfrm_address_t *daddr, xfrm_address_t *saddr,
-                           u8 proto)
-{
-       return NULL;
-}
-
 static struct xfrm_state_afinfo xfrm4_state_afinfo = {
        .family                 = AF_INET,
        .init_flags             = xfrm4_init_flags,
        .init_tempsel           = __xfrm4_init_tempsel,
-       .state_lookup           = __xfrm4_state_lookup,
-       .state_lookup_byaddr    = __xfrm4_state_lookup_byaddr,
 };
 
 void __init xfrm4_state_init(void)