Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d36b180 authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[XFRM]: annotate ->new_mapping() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d29ef86b

include/net/xfrm.h

+2 −2
Original line number Diff line number Diff line
@@ -379,7 +379,7 @@ struct xfrm_mgr 
	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);

	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			(*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 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 int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);

net/key/af_key.c

+1 −1
Original line number Diff line number Diff line
@@ -2938,7 +2938,7 @@ static struct xfrm_policy *pfkey_compile_policy(struct sock *sk, int opt, 
	return NULL;

}



static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport)

static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport)

{

	struct sk_buff *skb;

	struct sadb_msg *hdr;

net/xfrm/xfrm_state.c

+1 −1
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol) 
}

EXPORT_SYMBOL(km_query);



int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport)

int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport)

{

	int err = -EINVAL;

	struct xfrm_mgr *km;