Merge upstream (approx. 2.6.12-git8) into 'janitor' branch of netdev-2.6.

[linux-2.6] / include / net / xfrm.h

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 77bfdde440f8735508676f59f2d9b08a238a090e..029522a4cedab6c3f5ef61f56ce61cb5fe4714e4 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -204,6 +204,7 @@ struct xfrm_state_afinfo {
        rwlock_t                lock;
        struct list_head        *state_bydst;
        struct list_head        *state_byspi;
+       int                     (*init_flags)(struct xfrm_state *x);
        void                    (*init_tempsel)(struct xfrm_state *x, struct flowi *fl,
                                                struct xfrm_tmpl *tmpl,
                                                xfrm_address_t *daddr, xfrm_address_t *saddr);