diff options
Diffstat (limited to 'include/net/xfrm.h')
-rw-r--r-- | include/net/xfrm.h | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index d9c6dbb92719..7f38ef509957 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -121,8 +121,7 @@ struct xfrm_state_walk { | |||
121 | }; | 121 | }; |
122 | 122 | ||
123 | /* Full description of state of transformer. */ | 123 | /* Full description of state of transformer. */ |
124 | struct xfrm_state | 124 | struct xfrm_state { |
125 | { | ||
126 | #ifdef CONFIG_NET_NS | 125 | #ifdef CONFIG_NET_NS |
127 | struct net *xs_net; | 126 | struct net *xs_net; |
128 | #endif | 127 | #endif |
@@ -237,8 +236,7 @@ enum { | |||
237 | }; | 236 | }; |
238 | 237 | ||
239 | /* callback structure passed from either netlink or pfkey */ | 238 | /* callback structure passed from either netlink or pfkey */ |
240 | struct km_event | 239 | struct km_event { |
241 | { | ||
242 | union { | 240 | union { |
243 | u32 hard; | 241 | u32 hard; |
244 | u32 proto; | 242 | u32 proto; |
@@ -313,8 +311,7 @@ extern int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo); | |||
313 | 311 | ||
314 | extern void xfrm_state_delete_tunnel(struct xfrm_state *x); | 312 | extern void xfrm_state_delete_tunnel(struct xfrm_state *x); |
315 | 313 | ||
316 | struct xfrm_type | 314 | struct xfrm_type { |
317 | { | ||
318 | char *description; | 315 | char *description; |
319 | struct module *owner; | 316 | struct module *owner; |
320 | __u8 proto; | 317 | __u8 proto; |
@@ -420,8 +417,7 @@ static inline struct xfrm_mode *xfrm_ip2inner_mode(struct xfrm_state *x, int ipp | |||
420 | return x->inner_mode_iaf; | 417 | return x->inner_mode_iaf; |
421 | } | 418 | } |
422 | 419 | ||
423 | struct xfrm_tmpl | 420 | struct xfrm_tmpl { |
424 | { | ||
425 | /* id in template is interpreted as: | 421 | /* id in template is interpreted as: |
426 | * daddr - destination of tunnel, may be zero for transport mode. | 422 | * daddr - destination of tunnel, may be zero for transport mode. |
427 | * spi - zero to acquire spi. Not zero if spi is static, then | 423 | * spi - zero to acquire spi. Not zero if spi is static, then |
@@ -468,8 +464,7 @@ struct xfrm_policy_walk { | |||
468 | u32 seq; | 464 | u32 seq; |
469 | }; | 465 | }; |
470 | 466 | ||
471 | struct xfrm_policy | 467 | struct xfrm_policy { |
472 | { | ||
473 | #ifdef CONFIG_NET_NS | 468 | #ifdef CONFIG_NET_NS |
474 | struct net *xp_net; | 469 | struct net *xp_net; |
475 | #endif | 470 | #endif |
@@ -538,8 +533,7 @@ struct xfrm_migrate { | |||
538 | /* default seq threshold size */ | 533 | /* default seq threshold size */ |
539 | #define XFRM_AE_SEQT_SIZE 2 | 534 | #define XFRM_AE_SEQT_SIZE 2 |
540 | 535 | ||
541 | struct xfrm_mgr | 536 | struct xfrm_mgr { |
542 | { | ||
543 | struct list_head list; | 537 | struct list_head list; |
544 | char *id; | 538 | char *id; |
545 | int (*notify)(struct xfrm_state *x, struct km_event *c); | 539 | int (*notify)(struct xfrm_state *x, struct km_event *c); |
@@ -626,8 +620,7 @@ struct xfrm_spi_skb_cb { | |||
626 | #define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0])) | 620 | #define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0])) |
627 | 621 | ||
628 | /* Audit Information */ | 622 | /* Audit Information */ |
629 | struct xfrm_audit | 623 | struct xfrm_audit { |
630 | { | ||
631 | u32 secid; | 624 | u32 secid; |
632 | uid_t loginuid; | 625 | uid_t loginuid; |
633 | u32 sessionid; | 626 | u32 sessionid; |
@@ -871,8 +864,7 @@ static inline int xfrm_sec_ctx_match(struct xfrm_sec_ctx *s1, struct xfrm_sec_ct | |||
871 | * bundles differing by session id. All the bundles grow from a parent | 864 | * bundles differing by session id. All the bundles grow from a parent |
872 | * policy rule. | 865 | * policy rule. |
873 | */ | 866 | */ |
874 | struct xfrm_dst | 867 | struct xfrm_dst { |
875 | { | ||
876 | union { | 868 | union { |
877 | struct dst_entry dst; | 869 | struct dst_entry dst; |
878 | struct rtable rt; | 870 | struct rtable rt; |
@@ -907,8 +899,7 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) | |||
907 | 899 | ||
908 | extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev); | 900 | extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev); |
909 | 901 | ||
910 | struct sec_path | 902 | struct sec_path { |
911 | { | ||
912 | atomic_t refcnt; | 903 | atomic_t refcnt; |
913 | int len; | 904 | int len; |
914 | struct xfrm_state *xvec[XFRM_MAX_DEPTH]; | 905 | struct xfrm_state *xvec[XFRM_MAX_DEPTH]; |