aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
Diffstat (limited to 'include/net')
-rw-r--r--include/net/xfrm.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 2143f2911a21..f0f3318f6550 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -253,7 +253,8 @@ extern void km_state_expired(struct xfrm_state *x, int hard, u32 pid);
253extern int __xfrm_state_delete(struct xfrm_state *x); 253extern int __xfrm_state_delete(struct xfrm_state *x);
254 254
255struct xfrm_state_afinfo { 255struct xfrm_state_afinfo {
256 unsigned short family; 256 unsigned int family;
257 struct module *owner;
257 struct xfrm_type *type_map[IPPROTO_MAX]; 258 struct xfrm_type *type_map[IPPROTO_MAX];
258 struct xfrm_mode *mode_map[XFRM_MODE_MAX]; 259 struct xfrm_mode *mode_map[XFRM_MODE_MAX];
259 int (*init_flags)(struct xfrm_state *x); 260 int (*init_flags)(struct xfrm_state *x);
@@ -267,8 +268,6 @@ struct xfrm_state_afinfo {
267 268
268extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo); 269extern int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
269extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo); 270extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
270extern struct xfrm_state_afinfo *xfrm_state_get_afinfo(unsigned short family);
271extern void xfrm_state_put_afinfo(struct xfrm_state_afinfo *afinfo);
272 271
273extern void xfrm_state_delete_tunnel(struct xfrm_state *x); 272extern void xfrm_state_delete_tunnel(struct xfrm_state *x);
274 273
@@ -312,6 +311,7 @@ struct xfrm_mode {
312 */ 311 */
313 int (*output)(struct xfrm_state *x,struct sk_buff *skb); 312 int (*output)(struct xfrm_state *x,struct sk_buff *skb);
314 313
314 struct xfrm_state_afinfo *afinfo;
315 struct module *owner; 315 struct module *owner;
316 unsigned int encap; 316 unsigned int encap;
317 int flags; 317 int flags;