diff options
-rw-r--r-- | include/net/xfrm.h | 2 | ||||
-rw-r--r-- | net/xfrm/xfrm_policy.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 17b296b19982..1806c918a15a 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -1493,7 +1493,7 @@ extern int km_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, | |||
1493 | extern struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m); | 1493 | extern struct xfrm_state * xfrm_migrate_state_find(struct xfrm_migrate *m); |
1494 | extern struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x, | 1494 | extern struct xfrm_state * xfrm_state_migrate(struct xfrm_state *x, |
1495 | struct xfrm_migrate *m); | 1495 | struct xfrm_migrate *m); |
1496 | extern int xfrm_migrate(struct xfrm_selector *sel, u8 dir, u8 type, | 1496 | extern int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, |
1497 | struct xfrm_migrate *m, int num_bundles, | 1497 | struct xfrm_migrate *m, int num_bundles, |
1498 | struct xfrm_kmaddress *k); | 1498 | struct xfrm_kmaddress *k); |
1499 | #endif | 1499 | #endif |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 0770b3ae5ccb..0c503be3260c 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -2736,8 +2736,8 @@ EXPORT_SYMBOL_GPL(xfrm_audit_policy_delete); | |||
2736 | #endif | 2736 | #endif |
2737 | 2737 | ||
2738 | #ifdef CONFIG_XFRM_MIGRATE | 2738 | #ifdef CONFIG_XFRM_MIGRATE |
2739 | static int xfrm_migrate_selector_match(struct xfrm_selector *sel_cmp, | 2739 | static int xfrm_migrate_selector_match(const struct xfrm_selector *sel_cmp, |
2740 | struct xfrm_selector *sel_tgt) | 2740 | const struct xfrm_selector *sel_tgt) |
2741 | { | 2741 | { |
2742 | if (sel_cmp->proto == IPSEC_ULPROTO_ANY) { | 2742 | if (sel_cmp->proto == IPSEC_ULPROTO_ANY) { |
2743 | if (sel_tgt->family == sel_cmp->family && | 2743 | if (sel_tgt->family == sel_cmp->family && |
@@ -2757,7 +2757,7 @@ static int xfrm_migrate_selector_match(struct xfrm_selector *sel_cmp, | |||
2757 | return 0; | 2757 | return 0; |
2758 | } | 2758 | } |
2759 | 2759 | ||
2760 | static struct xfrm_policy * xfrm_migrate_policy_find(struct xfrm_selector *sel, | 2760 | static struct xfrm_policy * xfrm_migrate_policy_find(const struct xfrm_selector *sel, |
2761 | u8 dir, u8 type) | 2761 | u8 dir, u8 type) |
2762 | { | 2762 | { |
2763 | struct xfrm_policy *pol, *ret = NULL; | 2763 | struct xfrm_policy *pol, *ret = NULL; |
@@ -2897,7 +2897,7 @@ static int xfrm_migrate_check(const struct xfrm_migrate *m, int num_migrate) | |||
2897 | return 0; | 2897 | return 0; |
2898 | } | 2898 | } |
2899 | 2899 | ||
2900 | int xfrm_migrate(struct xfrm_selector *sel, u8 dir, u8 type, | 2900 | int xfrm_migrate(const struct xfrm_selector *sel, u8 dir, u8 type, |
2901 | struct xfrm_migrate *m, int num_migrate, | 2901 | struct xfrm_migrate *m, int num_migrate, |
2902 | struct xfrm_kmaddress *k) | 2902 | struct xfrm_kmaddress *k) |
2903 | { | 2903 | { |