aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2006-11-08 03:24:06 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:21:18 -0500
commit5d36b1803d875cf101fdb972ff9c56663e508e39 (patch)
tree36478dec86293ab8f3381a83ee3979f794958783
parentd29ef86b0a497dd2c4f9601644a15392f7e21f73 (diff)
[XFRM]: annotate ->new_mapping()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/xfrm.h4
-rw-r--r--net/key/af_key.c2
-rw-r--r--net/xfrm/xfrm_state.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 9d30c08b9efc..dbcd2922ff3f 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -379,7 +379,7 @@ struct xfrm_mgr
379 int (*notify)(struct xfrm_state *x, struct km_event *c); 379 int (*notify)(struct xfrm_state *x, struct km_event *c);
380 int (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir); 380 int (*acquire)(struct xfrm_state *x, struct xfrm_tmpl *, struct xfrm_policy *xp, int dir);
381 struct xfrm_policy *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir); 381 struct xfrm_policy *(*compile_policy)(struct sock *sk, int opt, u8 *data, int len, int *dir);
382 int (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport); 382 int (*new_mapping)(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
383 int (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c); 383 int (*notify_policy)(struct xfrm_policy *x, int dir, struct km_event *c);
384 int (*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr); 384 int (*report)(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
385}; 385};
@@ -999,7 +999,7 @@ extern int xfrm_bundle_ok(struct xfrm_policy *pol, struct xfrm_dst *xdst,
999extern void xfrm_init_pmtu(struct dst_entry *dst); 999extern void xfrm_init_pmtu(struct dst_entry *dst);
1000 1000
1001extern wait_queue_head_t km_waitq; 1001extern wait_queue_head_t km_waitq;
1002extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport); 1002extern int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport);
1003extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid); 1003extern void km_policy_expired(struct xfrm_policy *pol, int dir, int hard, u32 pid);
1004extern int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr); 1004extern int km_report(u8 proto, struct xfrm_selector *sel, xfrm_address_t *addr);
1005 1005
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 20ff7cca1d07..4e1830999482 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -2938,7 +2938,7 @@ out:
2938 return NULL; 2938 return NULL;
2939} 2939}
2940 2940
2941static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport) 2941static int pfkey_send_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport)
2942{ 2942{
2943 struct sk_buff *skb; 2943 struct sk_buff *skb;
2944 struct sadb_msg *hdr; 2944 struct sadb_msg *hdr;
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index 899de9ed22a6..864962bbda90 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -1304,7 +1304,7 @@ int km_query(struct xfrm_state *x, struct xfrm_tmpl *t, struct xfrm_policy *pol)
1304} 1304}
1305EXPORT_SYMBOL(km_query); 1305EXPORT_SYMBOL(km_query);
1306 1306
1307int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, u16 sport) 1307int km_new_mapping(struct xfrm_state *x, xfrm_address_t *ipaddr, __be16 sport)
1308{ 1308{
1309 int err = -EINVAL; 1309 int err = -EINVAL;
1310 struct xfrm_mgr *km; 1310 struct xfrm_mgr *km;