|
@@ -379,7 +379,7 @@ struct xfrm_mgr
|
|
int (*notify)(struct xfrm_state *x, struct km_event *c);
|
|
int (*notify)(struct xfrm_state *x, struct km_event *c);
|
|
int (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);
|
|
int (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);
|
|
struct xfrm_policy *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
|
|
struct xfrm_policy *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
|
|
- int (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport);
|
|
|
|
|
|
+ int (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
|
|
int (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);
|
|
int (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);
|
|
int (*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
|
|
int (*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
|
|
};
|
|
};
|
|
@@ -999,7 +999,7 @@ extern int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst,
|
|
extern void xfrm_init_pmtu(struct dst_entry *dst);
|
|
extern void xfrm_init_pmtu(struct dst_entry *dst);
|
|
|
|
|
|
extern wait_queue_head_t km_waitq;
|
|
extern wait_queue_head_t km_waitq;
|
|
-extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport);
|
|
|
|
|
|
+extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
|
|
extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid);
|
|
extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid);
|
|
extern int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
|
|
extern int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
|
|
|
|
|