aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/xfrm.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/net/xfrm.h')
-rw-r--r--include/net/xfrm.h12
1 files changed, 8 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 7e7e2b0d2915..01f5bc144ee5 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -631,7 +631,8 @@ struct xfrm_mgr {
631 u8 dir, u8 type, 631 u8 dir, u8 type,
632 const struct xfrm_migrate *m, 632 const struct xfrm_migrate *m,
633 int num_bundles, 633 int num_bundles,
634 const struct xfrm_kmaddress *k); 634 const struct xfrm_kmaddress *k,
635 const struct xfrm_encap_tmpl *encap);
635 bool (*is_alive)(const struct km_event *c); 636 bool (*is_alive)(const struct km_event *c);
636}; 637};
637 638
@@ -1675,13 +1676,16 @@ int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol);
1675#ifdef CONFIG_XFRM_MIGRATE 1676#ifdef CONFIG_XFRM_MIGRATE
1676int km_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, 1677int km_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
1677 const struct xfrm_migrate *m, int num_bundles, 1678 const struct xfrm_migrate *m, int num_bundles,
1678 const struct xfrm_kmaddress *k); 1679 const struct xfrm_kmaddress *k,
1680 const struct xfrm_encap_tmpl *encap);
1679struct xfrm_state *xfrm_migrate_state_find(struct xfrm_migrate *m, struct net *net); 1681struct xfrm_state *xfrm_migrate_state_find(struct xfrm_migrate *m, struct net *net);
1680struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x, 1682struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x,
1681 struct xfrm_migrate *m); 1683 struct xfrm_migrate *m,
1684 struct xfrm_encap_tmpl *encap);
1682int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, 1685int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type,
1683 struct xfrm_migrate *m, int num_bundles, 1686 struct xfrm_migrate *m, int num_bundles,
1684 struct xfrm_kmaddress *k, struct net *net); 1687 struct xfrm_kmaddress *k, struct net *net,
1688 struct xfrm_encap_tmpl *encap);
1685#endif 1689#endif
1686 1690
1687int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport); 1691int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);