diff options
Diffstat (limited to 'include/net')
37 files changed, 120 insertions, 240 deletions
diff --git a/include/net/ah.h b/include/net/ah.h index 7573a7152a72..f0129f79a31a 100644 --- a/include/net/ah.h +++ b/include/net/ah.h | |||
@@ -8,8 +8,7 @@ | |||
8 | 8 | ||
9 | struct crypto_ahash; | 9 | struct crypto_ahash; |
10 | 10 | ||
11 | struct ah_data | 11 | struct ah_data { |
12 | { | ||
13 | int icv_full_len; | 12 | int icv_full_len; |
14 | int icv_trunc_len; | 13 | int icv_trunc_len; |
15 | 14 | ||
diff --git a/include/net/dn_dev.h b/include/net/dn_dev.h index cee46821dc53..28966cae3fd7 100644 --- a/include/net/dn_dev.h +++ b/include/net/dn_dev.h | |||
@@ -97,16 +97,14 @@ struct dn_dev { | |||
97 | unsigned long uptime; /* Time device went up in jiffies */ | 97 | unsigned long uptime; /* Time device went up in jiffies */ |
98 | }; | 98 | }; |
99 | 99 | ||
100 | struct dn_short_packet | 100 | struct dn_short_packet { |
101 | { | ||
102 | __u8 msgflg; | 101 | __u8 msgflg; |
103 | __le16 dstnode; | 102 | __le16 dstnode; |
104 | __le16 srcnode; | 103 | __le16 srcnode; |
105 | __u8 forward; | 104 | __u8 forward; |
106 | } __attribute__((packed)); | 105 | } __attribute__((packed)); |
107 | 106 | ||
108 | struct dn_long_packet | 107 | struct dn_long_packet { |
109 | { | ||
110 | __u8 msgflg; | 108 | __u8 msgflg; |
111 | __u8 d_area; | 109 | __u8 d_area; |
112 | __u8 d_subarea; | 110 | __u8 d_subarea; |
@@ -122,8 +120,7 @@ struct dn_long_packet | |||
122 | 120 | ||
123 | /*------------------------- DRP - Routing messages ---------------------*/ | 121 | /*------------------------- DRP - Routing messages ---------------------*/ |
124 | 122 | ||
125 | struct endnode_hello_message | 123 | struct endnode_hello_message { |
126 | { | ||
127 | __u8 msgflg; | 124 | __u8 msgflg; |
128 | __u8 tiver[3]; | 125 | __u8 tiver[3]; |
129 | __u8 id[6]; | 126 | __u8 id[6]; |
@@ -138,8 +135,7 @@ struct endnode_hello_message | |||
138 | __u8 data[2]; | 135 | __u8 data[2]; |
139 | } __attribute__((packed)); | 136 | } __attribute__((packed)); |
140 | 137 | ||
141 | struct rtnode_hello_message | 138 | struct rtnode_hello_message { |
142 | { | ||
143 | __u8 msgflg; | 139 | __u8 msgflg; |
144 | __u8 tiver[3]; | 140 | __u8 tiver[3]; |
145 | __u8 id[6]; | 141 | __u8 id[6]; |
diff --git a/include/net/dn_fib.h b/include/net/dn_fib.h index c378be7bf960..52da6c3dd50d 100644 --- a/include/net/dn_fib.h +++ b/include/net/dn_fib.h | |||
@@ -4,8 +4,7 @@ | |||
4 | /* WARNING: The ordering of these elements must match ordering | 4 | /* WARNING: The ordering of these elements must match ordering |
5 | * of RTA_* rtnetlink attribute numbers. | 5 | * of RTA_* rtnetlink attribute numbers. |
6 | */ | 6 | */ |
7 | struct dn_kern_rta | 7 | struct dn_kern_rta { |
8 | { | ||
9 | void *rta_dst; | 8 | void *rta_dst; |
10 | void *rta_src; | 9 | void *rta_src; |
11 | int *rta_iif; | 10 | int *rta_iif; |
diff --git a/include/net/dn_nsp.h b/include/net/dn_nsp.h index 96e816b6974d..17d43d2db5ec 100644 --- a/include/net/dn_nsp.h +++ b/include/net/dn_nsp.h | |||
@@ -70,30 +70,26 @@ extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int nobl | |||
70 | 70 | ||
71 | /* Data Messages (data segment/interrupt/link service) */ | 71 | /* Data Messages (data segment/interrupt/link service) */ |
72 | 72 | ||
73 | struct nsp_data_seg_msg | 73 | struct nsp_data_seg_msg { |
74 | { | ||
75 | __u8 msgflg; | 74 | __u8 msgflg; |
76 | __le16 dstaddr; | 75 | __le16 dstaddr; |
77 | __le16 srcaddr; | 76 | __le16 srcaddr; |
78 | } __attribute__((packed)); | 77 | } __attribute__((packed)); |
79 | 78 | ||
80 | struct nsp_data_opt_msg | 79 | struct nsp_data_opt_msg { |
81 | { | ||
82 | __le16 acknum; | 80 | __le16 acknum; |
83 | __le16 segnum; | 81 | __le16 segnum; |
84 | __le16 lsflgs; | 82 | __le16 lsflgs; |
85 | } __attribute__((packed)); | 83 | } __attribute__((packed)); |
86 | 84 | ||
87 | struct nsp_data_opt_msg1 | 85 | struct nsp_data_opt_msg1 { |
88 | { | ||
89 | __le16 acknum; | 86 | __le16 acknum; |
90 | __le16 segnum; | 87 | __le16 segnum; |
91 | } __attribute__((packed)); | 88 | } __attribute__((packed)); |
92 | 89 | ||
93 | 90 | ||
94 | /* Acknowledgment Message (data/other data) */ | 91 | /* Acknowledgment Message (data/other data) */ |
95 | struct nsp_data_ack_msg | 92 | struct nsp_data_ack_msg { |
96 | { | ||
97 | __u8 msgflg; | 93 | __u8 msgflg; |
98 | __le16 dstaddr; | 94 | __le16 dstaddr; |
99 | __le16 srcaddr; | 95 | __le16 srcaddr; |
@@ -101,16 +97,14 @@ struct nsp_data_ack_msg | |||
101 | } __attribute__((packed)); | 97 | } __attribute__((packed)); |
102 | 98 | ||
103 | /* Connect Acknowledgment Message */ | 99 | /* Connect Acknowledgment Message */ |
104 | struct nsp_conn_ack_msg | 100 | struct nsp_conn_ack_msg { |
105 | { | ||
106 | __u8 msgflg; | 101 | __u8 msgflg; |
107 | __le16 dstaddr; | 102 | __le16 dstaddr; |
108 | } __attribute__((packed)); | 103 | } __attribute__((packed)); |
109 | 104 | ||
110 | 105 | ||
111 | /* Connect Initiate/Retransmit Initiate/Connect Confirm */ | 106 | /* Connect Initiate/Retransmit Initiate/Connect Confirm */ |
112 | struct nsp_conn_init_msg | 107 | struct nsp_conn_init_msg { |
113 | { | ||
114 | __u8 msgflg; | 108 | __u8 msgflg; |
115 | #define NSP_CI 0x18 /* Connect Initiate */ | 109 | #define NSP_CI 0x18 /* Connect Initiate */ |
116 | #define NSP_RCI 0x68 /* Retrans. Conn Init */ | 110 | #define NSP_RCI 0x68 /* Retrans. Conn Init */ |
@@ -126,8 +120,7 @@ struct nsp_conn_init_msg | |||
126 | } __attribute__((packed)); | 120 | } __attribute__((packed)); |
127 | 121 | ||
128 | /* Disconnect Initiate/Disconnect Confirm */ | 122 | /* Disconnect Initiate/Disconnect Confirm */ |
129 | struct nsp_disconn_init_msg | 123 | struct nsp_disconn_init_msg { |
130 | { | ||
131 | __u8 msgflg; | 124 | __u8 msgflg; |
132 | __le16 dstaddr; | 125 | __le16 dstaddr; |
133 | __le16 srcaddr; | 126 | __le16 srcaddr; |
@@ -136,8 +129,7 @@ struct nsp_disconn_init_msg | |||
136 | 129 | ||
137 | 130 | ||
138 | 131 | ||
139 | struct srcobj_fmt | 132 | struct srcobj_fmt { |
140 | { | ||
141 | __u8 format; | 133 | __u8 format; |
142 | __u8 task; | 134 | __u8 task; |
143 | __le16 grpcode; | 135 | __le16 grpcode; |
diff --git a/include/net/dst.h b/include/net/dst.h index 6377ab2feba9..39c4a5963e12 100644 --- a/include/net/dst.h +++ b/include/net/dst.h | |||
@@ -36,8 +36,7 @@ | |||
36 | 36 | ||
37 | struct sk_buff; | 37 | struct sk_buff; |
38 | 38 | ||
39 | struct dst_entry | 39 | struct dst_entry { |
40 | { | ||
41 | struct rcu_head rcu_head; | 40 | struct rcu_head rcu_head; |
42 | struct dst_entry *child; | 41 | struct dst_entry *child; |
43 | struct net_device *dev; | 42 | struct net_device *dev; |
diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h index ca4b2e840078..2cd707b15d59 100644 --- a/include/net/fib_rules.h +++ b/include/net/fib_rules.h | |||
@@ -7,8 +7,7 @@ | |||
7 | #include <net/flow.h> | 7 | #include <net/flow.h> |
8 | #include <net/rtnetlink.h> | 8 | #include <net/rtnetlink.h> |
9 | 9 | ||
10 | struct fib_rule | 10 | struct fib_rule { |
11 | { | ||
12 | struct list_head list; | 11 | struct list_head list; |
13 | atomic_t refcnt; | 12 | atomic_t refcnt; |
14 | int ifindex; | 13 | int ifindex; |
@@ -25,15 +24,13 @@ struct fib_rule | |||
25 | struct net * fr_net; | 24 | struct net * fr_net; |
26 | }; | 25 | }; |
27 | 26 | ||
28 | struct fib_lookup_arg | 27 | struct fib_lookup_arg { |
29 | { | ||
30 | void *lookup_ptr; | 28 | void *lookup_ptr; |
31 | void *result; | 29 | void *result; |
32 | struct fib_rule *rule; | 30 | struct fib_rule *rule; |
33 | }; | 31 | }; |
34 | 32 | ||
35 | struct fib_rules_ops | 33 | struct fib_rules_ops { |
36 | { | ||
37 | int family; | 34 | int family; |
38 | struct list_head list; | 35 | struct list_head list; |
39 | int rule_size; | 36 | int rule_size; |
diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h index eb87a1447ae1..fa157712e982 100644 --- a/include/net/gen_stats.h +++ b/include/net/gen_stats.h | |||
@@ -6,8 +6,7 @@ | |||
6 | #include <linux/rtnetlink.h> | 6 | #include <linux/rtnetlink.h> |
7 | #include <linux/pkt_sched.h> | 7 | #include <linux/pkt_sched.h> |
8 | 8 | ||
9 | struct gnet_dump | 9 | struct gnet_dump { |
10 | { | ||
11 | spinlock_t * lock; | 10 | spinlock_t * lock; |
12 | struct sk_buff * skb; | 11 | struct sk_buff * skb; |
13 | struct nlattr * tail; | 12 | struct nlattr * tail; |
diff --git a/include/net/genetlink.h b/include/net/genetlink.h index 2a1c06874c42..eb551baafc04 100644 --- a/include/net/genetlink.h +++ b/include/net/genetlink.h | |||
@@ -13,8 +13,7 @@ | |||
13 | * @list: list entry for linking | 13 | * @list: list entry for linking |
14 | * @family: pointer to family, need not be set before registering | 14 | * @family: pointer to family, need not be set before registering |
15 | */ | 15 | */ |
16 | struct genl_multicast_group | 16 | struct genl_multicast_group { |
17 | { | ||
18 | struct genl_family *family; /* private */ | 17 | struct genl_family *family; /* private */ |
19 | struct list_head list; /* private */ | 18 | struct list_head list; /* private */ |
20 | char name[GENL_NAMSIZ]; | 19 | char name[GENL_NAMSIZ]; |
@@ -35,8 +34,7 @@ struct genl_multicast_group | |||
35 | * @family_list: family list | 34 | * @family_list: family list |
36 | * @mcast_groups: multicast groups list | 35 | * @mcast_groups: multicast groups list |
37 | */ | 36 | */ |
38 | struct genl_family | 37 | struct genl_family { |
39 | { | ||
40 | unsigned int id; | 38 | unsigned int id; |
41 | unsigned int hdrsize; | 39 | unsigned int hdrsize; |
42 | char name[GENL_NAMSIZ]; | 40 | char name[GENL_NAMSIZ]; |
@@ -58,8 +56,7 @@ struct genl_family | |||
58 | * @userhdr: user specific header | 56 | * @userhdr: user specific header |
59 | * @attrs: netlink attributes | 57 | * @attrs: netlink attributes |
60 | */ | 58 | */ |
61 | struct genl_info | 59 | struct genl_info { |
62 | { | ||
63 | u32 snd_seq; | 60 | u32 snd_seq; |
64 | u32 snd_pid; | 61 | u32 snd_pid; |
65 | struct nlmsghdr * nlhdr; | 62 | struct nlmsghdr * nlhdr; |
@@ -102,8 +99,7 @@ static inline void genl_info_net_set(struct genl_info *info, struct net *net) | |||
102 | * @done: completion callback for dumps | 99 | * @done: completion callback for dumps |
103 | * @ops_list: operations list | 100 | * @ops_list: operations list |
104 | */ | 101 | */ |
105 | struct genl_ops | 102 | struct genl_ops { |
106 | { | ||
107 | u8 cmd; | 103 | u8 cmd; |
108 | unsigned int flags; | 104 | unsigned int flags; |
109 | const struct nla_policy *policy; | 105 | const struct nla_policy *policy; |
diff --git a/include/net/if_inet6.h b/include/net/if_inet6.h index 38b78132019b..e9d69d198495 100644 --- a/include/net/if_inet6.h +++ b/include/net/if_inet6.h | |||
@@ -32,8 +32,7 @@ | |||
32 | 32 | ||
33 | #ifdef __KERNEL__ | 33 | #ifdef __KERNEL__ |
34 | 34 | ||
35 | struct inet6_ifaddr | 35 | struct inet6_ifaddr { |
36 | { | ||
37 | struct in6_addr addr; | 36 | struct in6_addr addr; |
38 | __u32 prefix_len; | 37 | __u32 prefix_len; |
39 | 38 | ||
@@ -67,8 +66,7 @@ struct inet6_ifaddr | |||
67 | int dead; | 66 | int dead; |
68 | }; | 67 | }; |
69 | 68 | ||
70 | struct ip6_sf_socklist | 69 | struct ip6_sf_socklist { |
71 | { | ||
72 | unsigned int sl_max; | 70 | unsigned int sl_max; |
73 | unsigned int sl_count; | 71 | unsigned int sl_count; |
74 | struct in6_addr sl_addr[0]; | 72 | struct in6_addr sl_addr[0]; |
@@ -79,8 +77,7 @@ struct ip6_sf_socklist | |||
79 | 77 | ||
80 | #define IP6_SFBLOCK 10 /* allocate this many at once */ | 78 | #define IP6_SFBLOCK 10 /* allocate this many at once */ |
81 | 79 | ||
82 | struct ipv6_mc_socklist | 80 | struct ipv6_mc_socklist { |
83 | { | ||
84 | struct in6_addr addr; | 81 | struct in6_addr addr; |
85 | int ifindex; | 82 | int ifindex; |
86 | struct ipv6_mc_socklist *next; | 83 | struct ipv6_mc_socklist *next; |
@@ -89,8 +86,7 @@ struct ipv6_mc_socklist | |||
89 | struct ip6_sf_socklist *sflist; | 86 | struct ip6_sf_socklist *sflist; |
90 | }; | 87 | }; |
91 | 88 | ||
92 | struct ip6_sf_list | 89 | struct ip6_sf_list { |
93 | { | ||
94 | struct ip6_sf_list *sf_next; | 90 | struct ip6_sf_list *sf_next; |
95 | struct in6_addr sf_addr; | 91 | struct in6_addr sf_addr; |
96 | unsigned long sf_count[2]; /* include/exclude counts */ | 92 | unsigned long sf_count[2]; /* include/exclude counts */ |
@@ -105,8 +101,7 @@ struct ip6_sf_list | |||
105 | #define MAF_NOREPORT 0x08 | 101 | #define MAF_NOREPORT 0x08 |
106 | #define MAF_GSQUERY 0x10 | 102 | #define MAF_GSQUERY 0x10 |
107 | 103 | ||
108 | struct ifmcaddr6 | 104 | struct ifmcaddr6 { |
109 | { | ||
110 | struct in6_addr mca_addr; | 105 | struct in6_addr mca_addr; |
111 | struct inet6_dev *idev; | 106 | struct inet6_dev *idev; |
112 | struct ifmcaddr6 *next; | 107 | struct ifmcaddr6 *next; |
@@ -126,15 +121,13 @@ struct ifmcaddr6 | |||
126 | 121 | ||
127 | /* Anycast stuff */ | 122 | /* Anycast stuff */ |
128 | 123 | ||
129 | struct ipv6_ac_socklist | 124 | struct ipv6_ac_socklist { |
130 | { | ||
131 | struct in6_addr acl_addr; | 125 | struct in6_addr acl_addr; |
132 | int acl_ifindex; | 126 | int acl_ifindex; |
133 | struct ipv6_ac_socklist *acl_next; | 127 | struct ipv6_ac_socklist *acl_next; |
134 | }; | 128 | }; |
135 | 129 | ||
136 | struct ifacaddr6 | 130 | struct ifacaddr6 { |
137 | { | ||
138 | struct in6_addr aca_addr; | 131 | struct in6_addr aca_addr; |
139 | struct inet6_dev *aca_idev; | 132 | struct inet6_dev *aca_idev; |
140 | struct rt6_info *aca_rt; | 133 | struct rt6_info *aca_rt; |
@@ -157,8 +150,7 @@ struct ipv6_devstat { | |||
157 | DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg); | 150 | DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg); |
158 | }; | 151 | }; |
159 | 152 | ||
160 | struct inet6_dev | 153 | struct inet6_dev { |
161 | { | ||
162 | struct net_device *dev; | 154 | struct net_device *dev; |
163 | 155 | ||
164 | struct inet6_ifaddr *addr_list; | 156 | struct inet6_ifaddr *addr_list; |
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h index 15e1f8fe4c1f..35ad7b930467 100644 --- a/include/net/inetpeer.h +++ b/include/net/inetpeer.h | |||
@@ -13,8 +13,7 @@ | |||
13 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
14 | #include <asm/atomic.h> | 14 | #include <asm/atomic.h> |
15 | 15 | ||
16 | struct inet_peer | 16 | struct inet_peer { |
17 | { | ||
18 | /* group together avl_left,avl_right,v4daddr to speedup lookups */ | 17 | /* group together avl_left,avl_right,v4daddr to speedup lookups */ |
19 | struct inet_peer *avl_left, *avl_right; | 18 | struct inet_peer *avl_left, *avl_right; |
20 | __be32 v4daddr; /* peer's address */ | 19 | __be32 v4daddr; /* peer's address */ |
diff --git a/include/net/ip.h b/include/net/ip.h index 376adf47764e..e6b9d12d5f62 100644 --- a/include/net/ip.h +++ b/include/net/ip.h | |||
@@ -33,8 +33,7 @@ | |||
33 | 33 | ||
34 | struct sock; | 34 | struct sock; |
35 | 35 | ||
36 | struct inet_skb_parm | 36 | struct inet_skb_parm { |
37 | { | ||
38 | struct ip_options opt; /* Compiled IP options */ | 37 | struct ip_options opt; /* Compiled IP options */ |
39 | unsigned char flags; | 38 | unsigned char flags; |
40 | 39 | ||
@@ -50,8 +49,7 @@ static inline unsigned int ip_hdrlen(const struct sk_buff *skb) | |||
50 | return ip_hdr(skb)->ihl * 4; | 49 | return ip_hdr(skb)->ihl * 4; |
51 | } | 50 | } |
52 | 51 | ||
53 | struct ipcm_cookie | 52 | struct ipcm_cookie { |
54 | { | ||
55 | __be32 addr; | 53 | __be32 addr; |
56 | int oif; | 54 | int oif; |
57 | struct ip_options *opt; | 55 | struct ip_options *opt; |
@@ -60,8 +58,7 @@ struct ipcm_cookie | |||
60 | 58 | ||
61 | #define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb)) | 59 | #define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb)) |
62 | 60 | ||
63 | struct ip_ra_chain | 61 | struct ip_ra_chain { |
64 | { | ||
65 | struct ip_ra_chain *next; | 62 | struct ip_ra_chain *next; |
66 | struct sock *sk; | 63 | struct sock *sk; |
67 | void (*destructor)(struct sock *); | 64 | void (*destructor)(struct sock *); |
@@ -159,8 +156,7 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg) | |||
159 | void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg, | 156 | void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg, |
160 | unsigned int len); | 157 | unsigned int len); |
161 | 158 | ||
162 | struct ipv4_config | 159 | struct ipv4_config { |
163 | { | ||
164 | int log_martians; | 160 | int log_martians; |
165 | int no_pmtu_disc; | 161 | int no_pmtu_disc; |
166 | }; | 162 | }; |
@@ -336,8 +332,7 @@ extern int ip_call_ra_chain(struct sk_buff *skb); | |||
336 | * Functions provided by ip_fragment.c | 332 | * Functions provided by ip_fragment.c |
337 | */ | 333 | */ |
338 | 334 | ||
339 | enum ip_defrag_users | 335 | enum ip_defrag_users { |
340 | { | ||
341 | IP_DEFRAG_LOCAL_DELIVER, | 336 | IP_DEFRAG_LOCAL_DELIVER, |
342 | IP_DEFRAG_CALL_RA_CHAIN, | 337 | IP_DEFRAG_CALL_RA_CHAIN, |
343 | IP_DEFRAG_CONNTRACK_IN, | 338 | IP_DEFRAG_CONNTRACK_IN, |
diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 15b492a9aa79..257808188add 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h | |||
@@ -30,8 +30,7 @@ | |||
30 | 30 | ||
31 | struct rt6_info; | 31 | struct rt6_info; |
32 | 32 | ||
33 | struct fib6_config | 33 | struct fib6_config { |
34 | { | ||
35 | u32 fc_table; | 34 | u32 fc_table; |
36 | u32 fc_metric; | 35 | u32 fc_metric; |
37 | int fc_dst_len; | 36 | int fc_dst_len; |
@@ -51,8 +50,7 @@ struct fib6_config | |||
51 | struct nl_info fc_nlinfo; | 50 | struct nl_info fc_nlinfo; |
52 | }; | 51 | }; |
53 | 52 | ||
54 | struct fib6_node | 53 | struct fib6_node { |
55 | { | ||
56 | struct fib6_node *parent; | 54 | struct fib6_node *parent; |
57 | struct fib6_node *left; | 55 | struct fib6_node *left; |
58 | struct fib6_node *right; | 56 | struct fib6_node *right; |
@@ -78,16 +76,14 @@ struct fib6_node | |||
78 | * | 76 | * |
79 | */ | 77 | */ |
80 | 78 | ||
81 | struct rt6key | 79 | struct rt6key { |
82 | { | ||
83 | struct in6_addr addr; | 80 | struct in6_addr addr; |
84 | int plen; | 81 | int plen; |
85 | }; | 82 | }; |
86 | 83 | ||
87 | struct fib6_table; | 84 | struct fib6_table; |
88 | 85 | ||
89 | struct rt6_info | 86 | struct rt6_info { |
90 | { | ||
91 | union { | 87 | union { |
92 | struct dst_entry dst; | 88 | struct dst_entry dst; |
93 | } u; | 89 | } u; |
@@ -127,8 +123,7 @@ static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst) | |||
127 | return ((struct rt6_info *)dst)->rt6i_idev; | 123 | return ((struct rt6_info *)dst)->rt6i_idev; |
128 | } | 124 | } |
129 | 125 | ||
130 | struct fib6_walker_t | 126 | struct fib6_walker_t { |
131 | { | ||
132 | struct fib6_walker_t *prev, *next; | 127 | struct fib6_walker_t *prev, *next; |
133 | struct fib6_node *root, *node; | 128 | struct fib6_node *root, *node; |
134 | struct rt6_info *leaf; | 129 | struct rt6_info *leaf; |
diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 0e1b8aebaff8..4a808de7c0f6 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h | |||
@@ -103,8 +103,7 @@ extern void rt6_pmtu_discovery(struct in6_addr *daddr, | |||
103 | 103 | ||
104 | struct netlink_callback; | 104 | struct netlink_callback; |
105 | 105 | ||
106 | struct rt6_rtnl_dump_arg | 106 | struct rt6_rtnl_dump_arg { |
107 | { | ||
108 | struct sk_buff *skb; | 107 | struct sk_buff *skb; |
109 | struct netlink_callback *cb; | 108 | struct netlink_callback *cb; |
110 | struct net *net; | 109 | struct net *net; |
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 98978e73f666..8dc3296b7bea 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -251,8 +251,7 @@ struct ip_vs_estimator { | |||
251 | u32 outbps; | 251 | u32 outbps; |
252 | }; | 252 | }; |
253 | 253 | ||
254 | struct ip_vs_stats | 254 | struct ip_vs_stats { |
255 | { | ||
256 | struct ip_vs_stats_user ustats; /* statistics */ | 255 | struct ip_vs_stats_user ustats; /* statistics */ |
257 | struct ip_vs_estimator est; /* estimator */ | 256 | struct ip_vs_estimator est; /* estimator */ |
258 | 257 | ||
@@ -518,8 +517,7 @@ struct ip_vs_scheduler { | |||
518 | /* | 517 | /* |
519 | * The application module object (a.k.a. app incarnation) | 518 | * The application module object (a.k.a. app incarnation) |
520 | */ | 519 | */ |
521 | struct ip_vs_app | 520 | struct ip_vs_app { |
522 | { | ||
523 | struct list_head a_list; /* member in app list */ | 521 | struct list_head a_list; /* member in app list */ |
524 | int type; /* IP_VS_APP_TYPE_xxx */ | 522 | int type; /* IP_VS_APP_TYPE_xxx */ |
525 | char *name; /* application module name */ | 523 | char *name; /* application module name */ |
diff --git a/include/net/ipip.h b/include/net/ipip.h index b3db2fd6e61c..11e8513d2d07 100644 --- a/include/net/ipip.h +++ b/include/net/ipip.h | |||
@@ -8,16 +8,14 @@ | |||
8 | #define IPTUNNEL_ERR_TIMEO (30*HZ) | 8 | #define IPTUNNEL_ERR_TIMEO (30*HZ) |
9 | 9 | ||
10 | /* 6rd prefix/relay information */ | 10 | /* 6rd prefix/relay information */ |
11 | struct ip_tunnel_6rd_parm | 11 | struct ip_tunnel_6rd_parm { |
12 | { | ||
13 | struct in6_addr prefix; | 12 | struct in6_addr prefix; |
14 | __be32 relay_prefix; | 13 | __be32 relay_prefix; |
15 | u16 prefixlen; | 14 | u16 prefixlen; |
16 | u16 relay_prefixlen; | 15 | u16 relay_prefixlen; |
17 | }; | 16 | }; |
18 | 17 | ||
19 | struct ip_tunnel | 18 | struct ip_tunnel { |
20 | { | ||
21 | struct ip_tunnel *next; | 19 | struct ip_tunnel *next; |
22 | struct net_device *dev; | 20 | struct net_device *dev; |
23 | 21 | ||
@@ -40,8 +38,7 @@ struct ip_tunnel | |||
40 | unsigned int prl_count; /* # of entries in PRL */ | 38 | unsigned int prl_count; /* # of entries in PRL */ |
41 | }; | 39 | }; |
42 | 40 | ||
43 | struct ip_tunnel_prl_entry | 41 | struct ip_tunnel_prl_entry { |
44 | { | ||
45 | struct ip_tunnel_prl_entry *next; | 42 | struct ip_tunnel_prl_entry *next; |
46 | __be32 addr; | 43 | __be32 addr; |
47 | u16 flags; | 44 | u16 flags; |
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 8c31d8a0c1fe..92db8617d188 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h | |||
@@ -160,8 +160,7 @@ extern struct ctl_path net_ipv6_ctl_path[]; | |||
160 | #define ICMP6MSGIN_INC_STATS_BH(net, idev, field) \ | 160 | #define ICMP6MSGIN_INC_STATS_BH(net, idev, field) \ |
161 | _DEVINC(net, icmpv6msg, _BH, idev, field) | 161 | _DEVINC(net, icmpv6msg, _BH, idev, field) |
162 | 162 | ||
163 | struct ip6_ra_chain | 163 | struct ip6_ra_chain { |
164 | { | ||
165 | struct ip6_ra_chain *next; | 164 | struct ip6_ra_chain *next; |
166 | struct sock *sk; | 165 | struct sock *sk; |
167 | int sel; | 166 | int sel; |
@@ -176,8 +175,7 @@ extern rwlock_t ip6_ra_lock; | |||
176 | ancillary data and passed to IPv6. | 175 | ancillary data and passed to IPv6. |
177 | */ | 176 | */ |
178 | 177 | ||
179 | struct ipv6_txoptions | 178 | struct ipv6_txoptions { |
180 | { | ||
181 | /* Length of this structure */ | 179 | /* Length of this structure */ |
182 | int tot_len; | 180 | int tot_len; |
183 | 181 | ||
@@ -194,8 +192,7 @@ struct ipv6_txoptions | |||
194 | /* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */ | 192 | /* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */ |
195 | }; | 193 | }; |
196 | 194 | ||
197 | struct ip6_flowlabel | 195 | struct ip6_flowlabel { |
198 | { | ||
199 | struct ip6_flowlabel *next; | 196 | struct ip6_flowlabel *next; |
200 | __be32 label; | 197 | __be32 label; |
201 | atomic_t users; | 198 | atomic_t users; |
@@ -212,8 +209,7 @@ struct ip6_flowlabel | |||
212 | #define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF) | 209 | #define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF) |
213 | #define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF) | 210 | #define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF) |
214 | 211 | ||
215 | struct ipv6_fl_socklist | 212 | struct ipv6_fl_socklist { |
216 | { | ||
217 | struct ipv6_fl_socklist *next; | 213 | struct ipv6_fl_socklist *next; |
218 | struct ip6_flowlabel *fl; | 214 | struct ip6_flowlabel *fl; |
219 | }; | 215 | }; |
diff --git a/include/net/iw_handler.h b/include/net/iw_handler.h index d5d337170a56..b2b98f3fa265 100644 --- a/include/net/iw_handler.h +++ b/include/net/iw_handler.h | |||
@@ -300,8 +300,7 @@ | |||
300 | * This struct is also my long term insurance. I can add new fields here | 300 | * This struct is also my long term insurance. I can add new fields here |
301 | * without breaking the prototype of iw_handler... | 301 | * without breaking the prototype of iw_handler... |
302 | */ | 302 | */ |
303 | struct iw_request_info | 303 | struct iw_request_info { |
304 | { | ||
305 | __u16 cmd; /* Wireless Extension command */ | 304 | __u16 cmd; /* Wireless Extension command */ |
306 | __u16 flags; /* More to come ;-) */ | 305 | __u16 flags; /* More to come ;-) */ |
307 | }; | 306 | }; |
@@ -321,8 +320,7 @@ typedef int (*iw_handler)(struct net_device *dev, struct iw_request_info *info, | |||
321 | * shared by all driver instances... Same for the members... | 320 | * shared by all driver instances... Same for the members... |
322 | * This will be linked from net_device in <linux/netdevice.h> | 321 | * This will be linked from net_device in <linux/netdevice.h> |
323 | */ | 322 | */ |
324 | struct iw_handler_def | 323 | struct iw_handler_def { |
325 | { | ||
326 | 324 | ||
327 | /* Array of handlers for standard ioctls | 325 | /* Array of handlers for standard ioctls |
328 | * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWCOMMIT] | 326 | * We will call dev->wireless_handlers->standard[ioctl - SIOCSIWCOMMIT] |
@@ -372,8 +370,7 @@ struct iw_handler_def | |||
372 | /* | 370 | /* |
373 | * Describe how a standard IOCTL looks like. | 371 | * Describe how a standard IOCTL looks like. |
374 | */ | 372 | */ |
375 | struct iw_ioctl_description | 373 | struct iw_ioctl_description { |
376 | { | ||
377 | __u8 header_type; /* NULL, iw_point or other */ | 374 | __u8 header_type; /* NULL, iw_point or other */ |
378 | __u8 token_type; /* Future */ | 375 | __u8 token_type; /* Future */ |
379 | __u16 token_size; /* Granularity of payload */ | 376 | __u16 token_size; /* Granularity of payload */ |
@@ -395,8 +392,7 @@ struct iw_ioctl_description | |||
395 | /* | 392 | /* |
396 | * Instance specific spy data, i.e. addresses spied and quality for them. | 393 | * Instance specific spy data, i.e. addresses spied and quality for them. |
397 | */ | 394 | */ |
398 | struct iw_spy_data | 395 | struct iw_spy_data { |
399 | { | ||
400 | /* --- Standard spy support --- */ | 396 | /* --- Standard spy support --- */ |
401 | int spy_number; | 397 | int spy_number; |
402 | u_char spy_address[IW_MAX_SPY][ETH_ALEN]; | 398 | u_char spy_address[IW_MAX_SPY][ETH_ALEN]; |
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 3817fda82a80..db8e96dd114e 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -37,8 +37,7 @@ | |||
37 | 37 | ||
38 | struct neighbour; | 38 | struct neighbour; |
39 | 39 | ||
40 | struct neigh_parms | 40 | struct neigh_parms { |
41 | { | ||
42 | #ifdef CONFIG_NET_NS | 41 | #ifdef CONFIG_NET_NS |
43 | struct net *net; | 42 | struct net *net; |
44 | #endif | 43 | #endif |
@@ -70,8 +69,7 @@ struct neigh_parms | |||
70 | int locktime; | 69 | int locktime; |
71 | }; | 70 | }; |
72 | 71 | ||
73 | struct neigh_statistics | 72 | struct neigh_statistics { |
74 | { | ||
75 | unsigned long allocs; /* number of allocated neighs */ | 73 | unsigned long allocs; /* number of allocated neighs */ |
76 | unsigned long destroys; /* number of destroyed neighs */ | 74 | unsigned long destroys; /* number of destroyed neighs */ |
77 | unsigned long hash_grows; /* number of hash resizes */ | 75 | unsigned long hash_grows; /* number of hash resizes */ |
@@ -97,8 +95,7 @@ struct neigh_statistics | |||
97 | preempt_enable(); \ | 95 | preempt_enable(); \ |
98 | } while (0) | 96 | } while (0) |
99 | 97 | ||
100 | struct neighbour | 98 | struct neighbour { |
101 | { | ||
102 | struct neighbour *next; | 99 | struct neighbour *next; |
103 | struct neigh_table *tbl; | 100 | struct neigh_table *tbl; |
104 | struct neigh_parms *parms; | 101 | struct neigh_parms *parms; |
@@ -122,8 +119,7 @@ struct neighbour | |||
122 | u8 primary_key[0]; | 119 | u8 primary_key[0]; |
123 | }; | 120 | }; |
124 | 121 | ||
125 | struct neigh_ops | 122 | struct neigh_ops { |
126 | { | ||
127 | int family; | 123 | int family; |
128 | void (*solicit)(struct neighbour *, struct sk_buff*); | 124 | void (*solicit)(struct neighbour *, struct sk_buff*); |
129 | void (*error_report)(struct neighbour *, struct sk_buff*); | 125 | void (*error_report)(struct neighbour *, struct sk_buff*); |
@@ -133,8 +129,7 @@ struct neigh_ops | |||
133 | int (*queue_xmit)(struct sk_buff*); | 129 | int (*queue_xmit)(struct sk_buff*); |
134 | }; | 130 | }; |
135 | 131 | ||
136 | struct pneigh_entry | 132 | struct pneigh_entry { |
137 | { | ||
138 | struct pneigh_entry *next; | 133 | struct pneigh_entry *next; |
139 | #ifdef CONFIG_NET_NS | 134 | #ifdef CONFIG_NET_NS |
140 | struct net *net; | 135 | struct net *net; |
@@ -149,8 +144,7 @@ struct pneigh_entry | |||
149 | */ | 144 | */ |
150 | 145 | ||
151 | 146 | ||
152 | struct neigh_table | 147 | struct neigh_table { |
153 | { | ||
154 | struct neigh_table *next; | 148 | struct neigh_table *next; |
155 | int family; | 149 | int family; |
156 | int entry_size; | 150 | int entry_size; |
diff --git a/include/net/netfilter/nf_conntrack_ecache.h b/include/net/netfilter/nf_conntrack_ecache.h index 4f20d58e2ab7..475facc3051a 100644 --- a/include/net/netfilter/nf_conntrack_ecache.h +++ b/include/net/netfilter/nf_conntrack_ecache.h | |||
@@ -13,8 +13,7 @@ | |||
13 | #include <net/netfilter/nf_conntrack_extend.h> | 13 | #include <net/netfilter/nf_conntrack_extend.h> |
14 | 14 | ||
15 | /* Connection tracking event types */ | 15 | /* Connection tracking event types */ |
16 | enum ip_conntrack_events | 16 | enum ip_conntrack_events { |
17 | { | ||
18 | IPCT_NEW = 0, /* new conntrack */ | 17 | IPCT_NEW = 0, /* new conntrack */ |
19 | IPCT_RELATED = 1, /* related conntrack */ | 18 | IPCT_RELATED = 1, /* related conntrack */ |
20 | IPCT_DESTROY = 2, /* destroyed conntrack */ | 19 | IPCT_DESTROY = 2, /* destroyed conntrack */ |
diff --git a/include/net/netfilter/nf_conntrack_expect.h b/include/net/netfilter/nf_conntrack_expect.h index a9652806d0df..9a2b9cb52271 100644 --- a/include/net/netfilter/nf_conntrack_expect.h +++ b/include/net/netfilter/nf_conntrack_expect.h | |||
@@ -9,8 +9,7 @@ | |||
9 | extern unsigned int nf_ct_expect_hsize; | 9 | extern unsigned int nf_ct_expect_hsize; |
10 | extern unsigned int nf_ct_expect_max; | 10 | extern unsigned int nf_ct_expect_max; |
11 | 11 | ||
12 | struct nf_conntrack_expect | 12 | struct nf_conntrack_expect { |
13 | { | ||
14 | /* Conntrack expectation list member */ | 13 | /* Conntrack expectation list member */ |
15 | struct hlist_node lnode; | 14 | struct hlist_node lnode; |
16 | 15 | ||
@@ -64,8 +63,7 @@ static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp) | |||
64 | #endif | 63 | #endif |
65 | } | 64 | } |
66 | 65 | ||
67 | struct nf_conntrack_expect_policy | 66 | struct nf_conntrack_expect_policy { |
68 | { | ||
69 | unsigned int max_expected; | 67 | unsigned int max_expected; |
70 | unsigned int timeout; | 68 | unsigned int timeout; |
71 | }; | 69 | }; |
diff --git a/include/net/netfilter/nf_conntrack_extend.h b/include/net/netfilter/nf_conntrack_extend.h index 7f8fc5d123c5..e192dc17c583 100644 --- a/include/net/netfilter/nf_conntrack_extend.h +++ b/include/net/netfilter/nf_conntrack_extend.h | |||
@@ -3,8 +3,7 @@ | |||
3 | 3 | ||
4 | #include <net/netfilter/nf_conntrack.h> | 4 | #include <net/netfilter/nf_conntrack.h> |
5 | 5 | ||
6 | enum nf_ct_ext_id | 6 | enum nf_ct_ext_id { |
7 | { | ||
8 | NF_CT_EXT_HELPER, | 7 | NF_CT_EXT_HELPER, |
9 | NF_CT_EXT_NAT, | 8 | NF_CT_EXT_NAT, |
10 | NF_CT_EXT_ACCT, | 9 | NF_CT_EXT_ACCT, |
@@ -65,8 +64,7 @@ __nf_ct_ext_add(struct nf_conn *ct, enum nf_ct_ext_id id, gfp_t gfp); | |||
65 | 64 | ||
66 | #define NF_CT_EXT_F_PREALLOC 0x0001 | 65 | #define NF_CT_EXT_F_PREALLOC 0x0001 |
67 | 66 | ||
68 | struct nf_ct_ext_type | 67 | struct nf_ct_ext_type { |
69 | { | ||
70 | /* Destroys relationships (can be NULL). */ | 68 | /* Destroys relationships (can be NULL). */ |
71 | void (*destroy)(struct nf_conn *ct); | 69 | void (*destroy)(struct nf_conn *ct); |
72 | /* Called when realloacted (can be NULL). | 70 | /* Called when realloacted (can be NULL). |
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h index 1b7068000927..d015de92e03f 100644 --- a/include/net/netfilter/nf_conntrack_helper.h +++ b/include/net/netfilter/nf_conntrack_helper.h | |||
@@ -16,8 +16,7 @@ struct module; | |||
16 | 16 | ||
17 | #define NF_CT_HELPER_NAME_LEN 16 | 17 | #define NF_CT_HELPER_NAME_LEN 16 |
18 | 18 | ||
19 | struct nf_conntrack_helper | 19 | struct nf_conntrack_helper { |
20 | { | ||
21 | struct hlist_node hnode; /* Internal use. */ | 20 | struct hlist_node hnode; /* Internal use. */ |
22 | 21 | ||
23 | const char *name; /* name of the module */ | 22 | const char *name; /* name of the module */ |
diff --git a/include/net/netfilter/nf_conntrack_l3proto.h b/include/net/netfilter/nf_conntrack_l3proto.h index 9f99d36d5de9..a7547611e8f1 100644 --- a/include/net/netfilter/nf_conntrack_l3proto.h +++ b/include/net/netfilter/nf_conntrack_l3proto.h | |||
@@ -16,8 +16,7 @@ | |||
16 | #include <linux/seq_file.h> | 16 | #include <linux/seq_file.h> |
17 | #include <net/netfilter/nf_conntrack.h> | 17 | #include <net/netfilter/nf_conntrack.h> |
18 | 18 | ||
19 | struct nf_conntrack_l3proto | 19 | struct nf_conntrack_l3proto { |
20 | { | ||
21 | /* L3 Protocol Family number. ex) PF_INET */ | 20 | /* L3 Protocol Family number. ex) PF_INET */ |
22 | u_int16_t l3proto; | 21 | u_int16_t l3proto; |
23 | 22 | ||
diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h index 3767fb41e541..ca6dcf3445ab 100644 --- a/include/net/netfilter/nf_conntrack_l4proto.h +++ b/include/net/netfilter/nf_conntrack_l4proto.h | |||
@@ -15,8 +15,7 @@ | |||
15 | 15 | ||
16 | struct seq_file; | 16 | struct seq_file; |
17 | 17 | ||
18 | struct nf_conntrack_l4proto | 18 | struct nf_conntrack_l4proto { |
19 | { | ||
20 | /* L3 Protocol number. */ | 19 | /* L3 Protocol number. */ |
21 | u_int16_t l3proto; | 20 | u_int16_t l3proto; |
22 | 21 | ||
diff --git a/include/net/netfilter/nf_conntrack_tuple.h b/include/net/netfilter/nf_conntrack_tuple.h index 2628c154d40e..4ee44c84a304 100644 --- a/include/net/netfilter/nf_conntrack_tuple.h +++ b/include/net/netfilter/nf_conntrack_tuple.h | |||
@@ -26,8 +26,7 @@ | |||
26 | 26 | ||
27 | /* The protocol-specific manipulable parts of the tuple: always in | 27 | /* The protocol-specific manipulable parts of the tuple: always in |
28 | network order! */ | 28 | network order! */ |
29 | union nf_conntrack_man_proto | 29 | union nf_conntrack_man_proto { |
30 | { | ||
31 | /* Add other protocols here. */ | 30 | /* Add other protocols here. */ |
32 | __be16 all; | 31 | __be16 all; |
33 | 32 | ||
@@ -52,8 +51,7 @@ union nf_conntrack_man_proto | |||
52 | }; | 51 | }; |
53 | 52 | ||
54 | /* The manipulable part of the tuple. */ | 53 | /* The manipulable part of the tuple. */ |
55 | struct nf_conntrack_man | 54 | struct nf_conntrack_man { |
56 | { | ||
57 | union nf_inet_addr u3; | 55 | union nf_inet_addr u3; |
58 | union nf_conntrack_man_proto u; | 56 | union nf_conntrack_man_proto u; |
59 | /* Layer 3 protocol */ | 57 | /* Layer 3 protocol */ |
@@ -61,8 +59,7 @@ struct nf_conntrack_man | |||
61 | }; | 59 | }; |
62 | 60 | ||
63 | /* This contains the information to distinguish a connection. */ | 61 | /* This contains the information to distinguish a connection. */ |
64 | struct nf_conntrack_tuple | 62 | struct nf_conntrack_tuple { |
65 | { | ||
66 | struct nf_conntrack_man src; | 63 | struct nf_conntrack_man src; |
67 | 64 | ||
68 | /* These are the parts of the tuple which are fixed. */ | 65 | /* These are the parts of the tuple which are fixed. */ |
@@ -100,8 +97,7 @@ struct nf_conntrack_tuple | |||
100 | } dst; | 97 | } dst; |
101 | }; | 98 | }; |
102 | 99 | ||
103 | struct nf_conntrack_tuple_mask | 100 | struct nf_conntrack_tuple_mask { |
104 | { | ||
105 | struct { | 101 | struct { |
106 | union nf_inet_addr u3; | 102 | union nf_inet_addr u3; |
107 | union nf_conntrack_man_proto u; | 103 | union nf_conntrack_man_proto u; |
diff --git a/include/net/netfilter/nf_nat.h b/include/net/netfilter/nf_nat.h index 8df0b7f7fc6e..f5f09f032a90 100644 --- a/include/net/netfilter/nf_nat.h +++ b/include/net/netfilter/nf_nat.h | |||
@@ -5,8 +5,7 @@ | |||
5 | 5 | ||
6 | #define NF_NAT_MAPPING_TYPE_MAX_NAMELEN 16 | 6 | #define NF_NAT_MAPPING_TYPE_MAX_NAMELEN 16 |
7 | 7 | ||
8 | enum nf_nat_manip_type | 8 | enum nf_nat_manip_type { |
9 | { | ||
10 | IP_NAT_MANIP_SRC, | 9 | IP_NAT_MANIP_SRC, |
11 | IP_NAT_MANIP_DST | 10 | IP_NAT_MANIP_DST |
12 | }; | 11 | }; |
@@ -30,8 +29,7 @@ struct nf_nat_seq { | |||
30 | }; | 29 | }; |
31 | 30 | ||
32 | /* Single range specification. */ | 31 | /* Single range specification. */ |
33 | struct nf_nat_range | 32 | struct nf_nat_range { |
34 | { | ||
35 | /* Set to OR of flags above. */ | 33 | /* Set to OR of flags above. */ |
36 | unsigned int flags; | 34 | unsigned int flags; |
37 | 35 | ||
@@ -43,8 +41,7 @@ struct nf_nat_range | |||
43 | }; | 41 | }; |
44 | 42 | ||
45 | /* For backwards compat: don't use in modern code. */ | 43 | /* For backwards compat: don't use in modern code. */ |
46 | struct nf_nat_multi_range_compat | 44 | struct nf_nat_multi_range_compat { |
47 | { | ||
48 | unsigned int rangesize; /* Must be 1. */ | 45 | unsigned int rangesize; /* Must be 1. */ |
49 | 46 | ||
50 | /* hangs off end. */ | 47 | /* hangs off end. */ |
@@ -57,8 +54,7 @@ struct nf_nat_multi_range_compat | |||
57 | #include <net/netfilter/nf_conntrack_extend.h> | 54 | #include <net/netfilter/nf_conntrack_extend.h> |
58 | 55 | ||
59 | /* per conntrack: nat application helper private data */ | 56 | /* per conntrack: nat application helper private data */ |
60 | union nf_conntrack_nat_help | 57 | union nf_conntrack_nat_help { |
61 | { | ||
62 | /* insert nat helper private data here */ | 58 | /* insert nat helper private data here */ |
63 | struct nf_nat_pptp nat_pptp_info; | 59 | struct nf_nat_pptp nat_pptp_info; |
64 | }; | 60 | }; |
@@ -66,8 +62,7 @@ union nf_conntrack_nat_help | |||
66 | struct nf_conn; | 62 | struct nf_conn; |
67 | 63 | ||
68 | /* The structure embedded in the conntrack structure. */ | 64 | /* The structure embedded in the conntrack structure. */ |
69 | struct nf_conn_nat | 65 | struct nf_conn_nat { |
70 | { | ||
71 | struct hlist_node bysource; | 66 | struct hlist_node bysource; |
72 | struct nf_nat_seq seq[IP_CT_DIR_MAX]; | 67 | struct nf_nat_seq seq[IP_CT_DIR_MAX]; |
73 | struct nf_conn *ct; | 68 | struct nf_conn *ct; |
diff --git a/include/net/netfilter/nf_nat_protocol.h b/include/net/netfilter/nf_nat_protocol.h index f3662c4394ef..c398017ccfa3 100644 --- a/include/net/netfilter/nf_nat_protocol.h +++ b/include/net/netfilter/nf_nat_protocol.h | |||
@@ -6,8 +6,7 @@ | |||
6 | 6 | ||
7 | struct nf_nat_range; | 7 | struct nf_nat_range; |
8 | 8 | ||
9 | struct nf_nat_protocol | 9 | struct nf_nat_protocol { |
10 | { | ||
11 | /* Protocol number. */ | 10 | /* Protocol number. */ |
12 | unsigned int protonum; | 11 | unsigned int protonum; |
13 | 12 | ||
diff --git a/include/net/pkt_cls.h b/include/net/pkt_cls.h index d1ca31444644..3dd210d073ca 100644 --- a/include/net/pkt_cls.h +++ b/include/net/pkt_cls.h | |||
@@ -7,8 +7,7 @@ | |||
7 | 7 | ||
8 | /* Basic packet classifier frontend definitions. */ | 8 | /* Basic packet classifier frontend definitions. */ |
9 | 9 | ||
10 | struct tcf_walker | 10 | struct tcf_walker { |
11 | { | ||
12 | int stop; | 11 | int stop; |
13 | int skip; | 12 | int skip; |
14 | int count; | 13 | int count; |
@@ -61,8 +60,7 @@ tcf_unbind_filter(struct tcf_proto *tp, struct tcf_result *r) | |||
61 | tp->q->ops->cl_ops->unbind_tcf(tp->q, cl); | 60 | tp->q->ops->cl_ops->unbind_tcf(tp->q, cl); |
62 | } | 61 | } |
63 | 62 | ||
64 | struct tcf_exts | 63 | struct tcf_exts { |
65 | { | ||
66 | #ifdef CONFIG_NET_CLS_ACT | 64 | #ifdef CONFIG_NET_CLS_ACT |
67 | struct tc_action *action; | 65 | struct tc_action *action; |
68 | #endif | 66 | #endif |
@@ -71,8 +69,7 @@ struct tcf_exts | |||
71 | /* Map to export classifier specific extension TLV types to the | 69 | /* Map to export classifier specific extension TLV types to the |
72 | * generic extensions API. Unsupported extensions must be set to 0. | 70 | * generic extensions API. Unsupported extensions must be set to 0. |
73 | */ | 71 | */ |
74 | struct tcf_ext_map | 72 | struct tcf_ext_map { |
75 | { | ||
76 | int action; | 73 | int action; |
77 | int police; | 74 | int police; |
78 | }; | 75 | }; |
@@ -143,8 +140,7 @@ extern int tcf_exts_dump_stats(struct sk_buff *skb, struct tcf_exts *exts, | |||
143 | /** | 140 | /** |
144 | * struct tcf_pkt_info - packet information | 141 | * struct tcf_pkt_info - packet information |
145 | */ | 142 | */ |
146 | struct tcf_pkt_info | 143 | struct tcf_pkt_info { |
147 | { | ||
148 | unsigned char * ptr; | 144 | unsigned char * ptr; |
149 | int nexthdr; | 145 | int nexthdr; |
150 | }; | 146 | }; |
@@ -162,8 +158,7 @@ struct tcf_ematch_ops; | |||
162 | * @datalen: length of the ematch specific configuration data | 158 | * @datalen: length of the ematch specific configuration data |
163 | * @data: ematch specific data | 159 | * @data: ematch specific data |
164 | */ | 160 | */ |
165 | struct tcf_ematch | 161 | struct tcf_ematch { |
166 | { | ||
167 | struct tcf_ematch_ops * ops; | 162 | struct tcf_ematch_ops * ops; |
168 | unsigned long data; | 163 | unsigned long data; |
169 | unsigned int datalen; | 164 | unsigned int datalen; |
@@ -211,8 +206,7 @@ static inline int tcf_em_early_end(struct tcf_ematch *em, int result) | |||
211 | * @hdr: ematch tree header supplied by userspace | 206 | * @hdr: ematch tree header supplied by userspace |
212 | * @matches: array of ematches | 207 | * @matches: array of ematches |
213 | */ | 208 | */ |
214 | struct tcf_ematch_tree | 209 | struct tcf_ematch_tree { |
215 | { | ||
216 | struct tcf_ematch_tree_hdr hdr; | 210 | struct tcf_ematch_tree_hdr hdr; |
217 | struct tcf_ematch * matches; | 211 | struct tcf_ematch * matches; |
218 | 212 | ||
@@ -230,8 +224,7 @@ struct tcf_ematch_tree | |||
230 | * @owner: owner, must be set to THIS_MODULE | 224 | * @owner: owner, must be set to THIS_MODULE |
231 | * @link: link to previous/next ematch module (internal use) | 225 | * @link: link to previous/next ematch module (internal use) |
232 | */ | 226 | */ |
233 | struct tcf_ematch_ops | 227 | struct tcf_ematch_ops { |
234 | { | ||
235 | int kind; | 228 | int kind; |
236 | int datalen; | 229 | int datalen; |
237 | int (*change)(struct tcf_proto *, void *, | 230 | int (*change)(struct tcf_proto *, void *, |
@@ -302,8 +295,7 @@ static inline int tcf_em_tree_match(struct sk_buff *skb, | |||
302 | 295 | ||
303 | #else /* CONFIG_NET_EMATCH */ | 296 | #else /* CONFIG_NET_EMATCH */ |
304 | 297 | ||
305 | struct tcf_ematch_tree | 298 | struct tcf_ematch_tree { |
306 | { | ||
307 | }; | 299 | }; |
308 | 300 | ||
309 | #define tcf_em_tree_validate(tp, tb, t) ((void)(t), 0) | 301 | #define tcf_em_tree_validate(tp, tb, t) ((void)(t), 0) |
diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h index f911ec7598ef..2d567265363e 100644 --- a/include/net/pkt_sched.h +++ b/include/net/pkt_sched.h | |||
@@ -5,8 +5,7 @@ | |||
5 | #include <linux/ktime.h> | 5 | #include <linux/ktime.h> |
6 | #include <net/sch_generic.h> | 6 | #include <net/sch_generic.h> |
7 | 7 | ||
8 | struct qdisc_walker | 8 | struct qdisc_walker { |
9 | { | ||
10 | int stop; | 9 | int stop; |
11 | int skip; | 10 | int skip; |
12 | int count; | 11 | int count; |
diff --git a/include/net/protocol.h b/include/net/protocol.h index 60249e51b669..89932d45da59 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h | |||
@@ -47,8 +47,7 @@ struct net_protocol { | |||
47 | }; | 47 | }; |
48 | 48 | ||
49 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) | 49 | #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) |
50 | struct inet6_protocol | 50 | struct inet6_protocol { |
51 | { | ||
52 | int (*handler)(struct sk_buff *skb); | 51 | int (*handler)(struct sk_buff *skb); |
53 | 52 | ||
54 | void (*err_handler)(struct sk_buff *skb, | 53 | void (*err_handler)(struct sk_buff *skb, |
diff --git a/include/net/red.h b/include/net/red.h index 3cf31d466a81..995108e54d9f 100644 --- a/include/net/red.h +++ b/include/net/red.h | |||
@@ -90,8 +90,7 @@ | |||
90 | #define RED_STAB_SIZE 256 | 90 | #define RED_STAB_SIZE 256 |
91 | #define RED_STAB_MASK (RED_STAB_SIZE - 1) | 91 | #define RED_STAB_MASK (RED_STAB_SIZE - 1) |
92 | 92 | ||
93 | struct red_stats | 93 | struct red_stats { |
94 | { | ||
95 | u32 prob_drop; /* Early probability drops */ | 94 | u32 prob_drop; /* Early probability drops */ |
96 | u32 prob_mark; /* Early probability marks */ | 95 | u32 prob_mark; /* Early probability marks */ |
97 | u32 forced_drop; /* Forced drops, qavg > max_thresh */ | 96 | u32 forced_drop; /* Forced drops, qavg > max_thresh */ |
@@ -101,8 +100,7 @@ struct red_stats | |||
101 | u32 backlog; | 100 | u32 backlog; |
102 | }; | 101 | }; |
103 | 102 | ||
104 | struct red_parms | 103 | struct red_parms { |
105 | { | ||
106 | /* Parameters */ | 104 | /* Parameters */ |
107 | u32 qth_min; /* Min avg length threshold: A scaled */ | 105 | u32 qth_min; /* Min avg length threshold: A scaled */ |
108 | u32 qth_max; /* Max avg length threshold: A scaled */ | 106 | u32 qth_max; /* Max avg length threshold: A scaled */ |
diff --git a/include/net/route.h b/include/net/route.h index 40f6346ef496..cfb4c071a136 100644 --- a/include/net/route.h +++ b/include/net/route.h | |||
@@ -49,10 +49,8 @@ | |||
49 | 49 | ||
50 | struct fib_nh; | 50 | struct fib_nh; |
51 | struct inet_peer; | 51 | struct inet_peer; |
52 | struct rtable | 52 | struct rtable { |
53 | { | 53 | union { |
54 | union | ||
55 | { | ||
56 | struct dst_entry dst; | 54 | struct dst_entry dst; |
57 | } u; | 55 | } u; |
58 | 56 | ||
@@ -77,16 +75,14 @@ struct rtable | |||
77 | struct inet_peer *peer; /* long-living peer info */ | 75 | struct inet_peer *peer; /* long-living peer info */ |
78 | }; | 76 | }; |
79 | 77 | ||
80 | struct ip_rt_acct | 78 | struct ip_rt_acct { |
81 | { | ||
82 | __u32 o_bytes; | 79 | __u32 o_bytes; |
83 | __u32 o_packets; | 80 | __u32 o_packets; |
84 | __u32 i_bytes; | 81 | __u32 i_bytes; |
85 | __u32 i_packets; | 82 | __u32 i_packets; |
86 | }; | 83 | }; |
87 | 84 | ||
88 | struct rt_cache_stat | 85 | struct rt_cache_stat { |
89 | { | ||
90 | unsigned int in_hit; | 86 | unsigned int in_hit; |
91 | unsigned int in_slow_tot; | 87 | unsigned int in_slow_tot; |
92 | unsigned int in_slow_mc; | 88 | unsigned int in_slow_mc; |
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index c33180dd42b4..dad558bc06fa 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h | |||
@@ -15,16 +15,14 @@ struct qdisc_walker; | |||
15 | struct tcf_walker; | 15 | struct tcf_walker; |
16 | struct module; | 16 | struct module; |
17 | 17 | ||
18 | struct qdisc_rate_table | 18 | struct qdisc_rate_table { |
19 | { | ||
20 | struct tc_ratespec rate; | 19 | struct tc_ratespec rate; |
21 | u32 data[256]; | 20 | u32 data[256]; |
22 | struct qdisc_rate_table *next; | 21 | struct qdisc_rate_table *next; |
23 | int refcnt; | 22 | int refcnt; |
24 | }; | 23 | }; |
25 | 24 | ||
26 | enum qdisc_state_t | 25 | enum qdisc_state_t { |
27 | { | ||
28 | __QDISC_STATE_RUNNING, | 26 | __QDISC_STATE_RUNNING, |
29 | __QDISC_STATE_SCHED, | 27 | __QDISC_STATE_SCHED, |
30 | __QDISC_STATE_DEACTIVATED, | 28 | __QDISC_STATE_DEACTIVATED, |
@@ -37,8 +35,7 @@ struct qdisc_size_table { | |||
37 | u16 data[]; | 35 | u16 data[]; |
38 | }; | 36 | }; |
39 | 37 | ||
40 | struct Qdisc | 38 | struct Qdisc { |
41 | { | ||
42 | int (*enqueue)(struct sk_buff *skb, struct Qdisc *dev); | 39 | int (*enqueue)(struct sk_buff *skb, struct Qdisc *dev); |
43 | struct sk_buff * (*dequeue)(struct Qdisc *dev); | 40 | struct sk_buff * (*dequeue)(struct Qdisc *dev); |
44 | unsigned flags; | 41 | unsigned flags; |
@@ -78,8 +75,7 @@ struct Qdisc | |||
78 | struct gnet_stats_queue qstats; | 75 | struct gnet_stats_queue qstats; |
79 | }; | 76 | }; |
80 | 77 | ||
81 | struct Qdisc_class_ops | 78 | struct Qdisc_class_ops { |
82 | { | ||
83 | /* Child qdisc manipulation */ | 79 | /* Child qdisc manipulation */ |
84 | struct netdev_queue * (*select_queue)(struct Qdisc *, struct tcmsg *); | 80 | struct netdev_queue * (*select_queue)(struct Qdisc *, struct tcmsg *); |
85 | int (*graft)(struct Qdisc *, unsigned long cl, | 81 | int (*graft)(struct Qdisc *, unsigned long cl, |
@@ -108,8 +104,7 @@ struct Qdisc_class_ops | |||
108 | struct gnet_dump *); | 104 | struct gnet_dump *); |
109 | }; | 105 | }; |
110 | 106 | ||
111 | struct Qdisc_ops | 107 | struct Qdisc_ops { |
112 | { | ||
113 | struct Qdisc_ops *next; | 108 | struct Qdisc_ops *next; |
114 | const struct Qdisc_class_ops *cl_ops; | 109 | const struct Qdisc_class_ops *cl_ops; |
115 | char id[IFNAMSIZ]; | 110 | char id[IFNAMSIZ]; |
@@ -133,14 +128,12 @@ struct Qdisc_ops | |||
133 | }; | 128 | }; |
134 | 129 | ||
135 | 130 | ||
136 | struct tcf_result | 131 | struct tcf_result { |
137 | { | ||
138 | unsigned long class; | 132 | unsigned long class; |
139 | u32 classid; | 133 | u32 classid; |
140 | }; | 134 | }; |
141 | 135 | ||
142 | struct tcf_proto_ops | 136 | struct tcf_proto_ops { |
143 | { | ||
144 | struct tcf_proto_ops *next; | 137 | struct tcf_proto_ops *next; |
145 | char kind[IFNAMSIZ]; | 138 | char kind[IFNAMSIZ]; |
146 | 139 | ||
@@ -164,8 +157,7 @@ struct tcf_proto_ops | |||
164 | struct module *owner; | 157 | struct module *owner; |
165 | }; | 158 | }; |
166 | 159 | ||
167 | struct tcf_proto | 160 | struct tcf_proto { |
168 | { | ||
169 | /* Fast access part */ | 161 | /* Fast access part */ |
170 | struct tcf_proto *next; | 162 | struct tcf_proto *next; |
171 | void *root; | 163 | void *root; |
@@ -261,14 +253,12 @@ extern struct Qdisc_ops noop_qdisc_ops; | |||
261 | extern struct Qdisc_ops pfifo_fast_ops; | 253 | extern struct Qdisc_ops pfifo_fast_ops; |
262 | extern struct Qdisc_ops mq_qdisc_ops; | 254 | extern struct Qdisc_ops mq_qdisc_ops; |
263 | 255 | ||
264 | struct Qdisc_class_common | 256 | struct Qdisc_class_common { |
265 | { | ||
266 | u32 classid; | 257 | u32 classid; |
267 | struct hlist_node hnode; | 258 | struct hlist_node hnode; |
268 | }; | 259 | }; |
269 | 260 | ||
270 | struct Qdisc_class_hash | 261 | struct Qdisc_class_hash { |
271 | { | ||
272 | struct hlist_head *hash; | 262 | struct hlist_head *hash; |
273 | unsigned int hashsize; | 263 | unsigned int hashsize; |
274 | unsigned int hashmask; | 264 | unsigned int hashmask; |
diff --git a/include/net/scm.h b/include/net/scm.h index cf48c800e926..8360e47aa7e3 100644 --- a/include/net/scm.h +++ b/include/net/scm.h | |||
@@ -12,15 +12,13 @@ | |||
12 | */ | 12 | */ |
13 | #define SCM_MAX_FD 255 | 13 | #define SCM_MAX_FD 255 |
14 | 14 | ||
15 | struct scm_fp_list | 15 | struct scm_fp_list { |
16 | { | ||
17 | struct list_head list; | 16 | struct list_head list; |
18 | int count; | 17 | int count; |
19 | struct file *fp[SCM_MAX_FD]; | 18 | struct file *fp[SCM_MAX_FD]; |
20 | }; | 19 | }; |
21 | 20 | ||
22 | struct scm_cookie | 21 | struct scm_cookie { |
23 | { | ||
24 | struct ucred creds; /* Skb credentials */ | 22 | struct ucred creds; /* Skb credentials */ |
25 | struct scm_fp_list *fp; /* Passed files */ | 23 | struct scm_fp_list *fp; /* Passed files */ |
26 | #ifdef CONFIG_SECURITY_NETWORK | 24 | #ifdef CONFIG_SECURITY_NETWORK |
@@ -88,8 +86,7 @@ static inline void scm_passec(struct socket *sock, struct msghdr *msg, struct sc | |||
88 | static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg, | 86 | static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg, |
89 | struct scm_cookie *scm, int flags) | 87 | struct scm_cookie *scm, int flags) |
90 | { | 88 | { |
91 | if (!msg->msg_control) | 89 | if (!msg->msg_control) { |
92 | { | ||
93 | if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp) | 90 | if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp) |
94 | msg->msg_flags |= MSG_CTRUNC; | 91 | msg->msg_flags |= MSG_CTRUNC; |
95 | scm_destroy(scm); | 92 | scm_destroy(scm); |
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h index 8a6d5297de16..78740ec57d5d 100644 --- a/include/net/sctp/sctp.h +++ b/include/net/sctp/sctp.h | |||
@@ -227,8 +227,7 @@ DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics); | |||
227 | #endif /* !TEST_FRAME */ | 227 | #endif /* !TEST_FRAME */ |
228 | 228 | ||
229 | /* sctp mib definitions */ | 229 | /* sctp mib definitions */ |
230 | enum | 230 | enum { |
231 | { | ||
232 | SCTP_MIB_NUM = 0, | 231 | SCTP_MIB_NUM = 0, |
233 | SCTP_MIB_CURRESTAB, /* CurrEstab */ | 232 | SCTP_MIB_CURRESTAB, /* CurrEstab */ |
234 | SCTP_MIB_ACTIVEESTABS, /* ActiveEstabs */ | 233 | SCTP_MIB_ACTIVEESTABS, /* ActiveEstabs */ |
diff --git a/include/net/tcp.h b/include/net/tcp.h index 740d09be8e2d..bf20f88fd033 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -359,8 +359,7 @@ TCP_ECN_create_request(struct request_sock *req, struct tcphdr *th) | |||
359 | inet_rsk(req)->ecn_ok = 1; | 359 | inet_rsk(req)->ecn_ok = 1; |
360 | } | 360 | } |
361 | 361 | ||
362 | enum tcp_tw_status | 362 | enum tcp_tw_status { |
363 | { | ||
364 | TCP_TW_SUCCESS = 0, | 363 | TCP_TW_SUCCESS = 0, |
365 | TCP_TW_RST = 1, | 364 | TCP_TW_RST = 1, |
366 | TCP_TW_ACK = 2, | 365 | TCP_TW_ACK = 2, |
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]; |