diff options
Diffstat (limited to 'include/net/xfrm.h')
-rw-r--r-- | include/net/xfrm.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 1078828580d2..94159dc547fc 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -1739,13 +1739,16 @@ int xfrm_policy_walk(struct net *net, struct xfrm_policy_walk *walk, | |||
1739 | void *); | 1739 | void *); |
1740 | void xfrm_policy_walk_done(struct xfrm_policy_walk *walk, struct net *net); | 1740 | void xfrm_policy_walk_done(struct xfrm_policy_walk *walk, struct net *net); |
1741 | int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl); | 1741 | int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl); |
1742 | struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, u32 mark, u32 if_id, | 1742 | struct xfrm_policy *xfrm_policy_bysel_ctx(struct net *net, |
1743 | u8 type, int dir, | 1743 | const struct xfrm_mark *mark, |
1744 | u32 if_id, u8 type, int dir, | ||
1744 | struct xfrm_selector *sel, | 1745 | struct xfrm_selector *sel, |
1745 | struct xfrm_sec_ctx *ctx, int delete, | 1746 | struct xfrm_sec_ctx *ctx, int delete, |
1746 | int *err); | 1747 | int *err); |
1747 | struct xfrm_policy *xfrm_policy_byid(struct net *net, u32 mark, u32 if_id, u8, | 1748 | struct xfrm_policy *xfrm_policy_byid(struct net *net, |
1748 | int dir, u32 id, int delete, int *err); | 1749 | const struct xfrm_mark *mark, u32 if_id, |
1750 | u8 type, int dir, u32 id, int delete, | ||
1751 | int *err); | ||
1749 | int xfrm_policy_flush(struct net *net, u8 type, bool task_valid); | 1752 | int xfrm_policy_flush(struct net *net, u8 type, bool task_valid); |
1750 | void xfrm_policy_hash_rebuild(struct net *net); | 1753 | void xfrm_policy_hash_rebuild(struct net *net); |
1751 | u32 xfrm_get_acqseq(void); | 1754 | u32 xfrm_get_acqseq(void); |
@@ -1763,14 +1766,15 @@ int km_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, | |||
1763 | const struct xfrm_migrate *m, int num_bundles, | 1766 | const struct xfrm_migrate *m, int num_bundles, |
1764 | const struct xfrm_kmaddress *k, | 1767 | const struct xfrm_kmaddress *k, |
1765 | const struct xfrm_encap_tmpl *encap); | 1768 | const struct xfrm_encap_tmpl *encap); |
1766 | struct xfrm_state *xfrm_migrate_state_find(struct xfrm_migrate *m, struct net *net); | 1769 | struct xfrm_state *xfrm_migrate_state_find(struct xfrm_migrate *m, struct net *net, |
1770 | u32 if_id); | ||
1767 | struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x, | 1771 | struct xfrm_state *xfrm_state_migrate(struct xfrm_state *x, |
1768 | struct xfrm_migrate *m, | 1772 | struct xfrm_migrate *m, |
1769 | struct xfrm_encap_tmpl *encap); | 1773 | struct xfrm_encap_tmpl *encap); |
1770 | int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, | 1774 | int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, |
1771 | struct xfrm_migrate *m, int num_bundles, | 1775 | struct xfrm_migrate *m, int num_bundles, |
1772 | struct xfrm_kmaddress *k, struct net *net, | 1776 | struct xfrm_kmaddress *k, struct net *net, |
1773 | struct xfrm_encap_tmpl *encap); | 1777 | struct xfrm_encap_tmpl *encap, u32 if_id); |
1774 | #endif | 1778 | #endif |
1775 | 1779 | ||
1776 | int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport); | 1780 | int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport); |