tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
net: cleanup include/net
This cleanup patch puts struct/union/enum opening braces,
in first line to ease grep games.
struct something
{
becomes :
struct something {
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
authored by
Eric Dumazet
and committed by
David S. Miller
fd2c3ef7
4b7673a0
+120
-240
+1
-2
include/net/ah.h
+1
-2
include/net/ah.h
+4
-8
include/net/dn_dev.h
+4
-8
include/net/dn_dev.h
···
97
97
unsigned long uptime; /* Time device went up in jiffies */
98
98
};
99
99
100
-
struct dn_short_packet
101
-
{
100
+
struct dn_short_packet {
102
101
__u8 msgflg;
103
102
__le16 dstnode;
104
103
__le16 srcnode;
105
104
__u8 forward;
106
105
} __attribute__((packed));
107
106
108
-
struct dn_long_packet
109
-
{
107
+
struct dn_long_packet {
110
108
__u8 msgflg;
111
109
__u8 d_area;
112
110
__u8 d_subarea;
···
120
122
121
123
/*------------------------- DRP - Routing messages ---------------------*/
122
124
123
-
struct endnode_hello_message
124
-
{
125
+
struct endnode_hello_message {
125
126
__u8 msgflg;
126
127
__u8 tiver[3];
127
128
__u8 id[6];
···
135
138
__u8 data[2];
136
139
} __attribute__((packed));
137
140
138
-
struct rtnode_hello_message
139
-
{
141
+
struct rtnode_hello_message {
140
142
__u8 msgflg;
141
143
__u8 tiver[3];
142
144
__u8 id[6];
+1
-2
include/net/dn_fib.h
+1
-2
include/net/dn_fib.h
+8
-16
include/net/dn_nsp.h
+8
-16
include/net/dn_nsp.h
···
70
70
71
71
/* Data Messages (data segment/interrupt/link service) */
72
72
73
-
struct nsp_data_seg_msg
74
-
{
73
+
struct nsp_data_seg_msg {
75
74
__u8 msgflg;
76
75
__le16 dstaddr;
77
76
__le16 srcaddr;
78
77
} __attribute__((packed));
79
78
80
-
struct nsp_data_opt_msg
81
-
{
79
+
struct nsp_data_opt_msg {
82
80
__le16 acknum;
83
81
__le16 segnum;
84
82
__le16 lsflgs;
85
83
} __attribute__((packed));
86
84
87
-
struct nsp_data_opt_msg1
88
-
{
85
+
struct nsp_data_opt_msg1 {
89
86
__le16 acknum;
90
87
__le16 segnum;
91
88
} __attribute__((packed));
92
89
93
90
94
91
/* Acknowledgment Message (data/other data) */
95
-
struct nsp_data_ack_msg
96
-
{
92
+
struct nsp_data_ack_msg {
97
93
__u8 msgflg;
98
94
__le16 dstaddr;
99
95
__le16 srcaddr;
···
97
101
} __attribute__((packed));
98
102
99
103
/* Connect Acknowledgment Message */
100
-
struct nsp_conn_ack_msg
101
-
{
104
+
struct nsp_conn_ack_msg {
102
105
__u8 msgflg;
103
106
__le16 dstaddr;
104
107
} __attribute__((packed));
105
108
106
109
107
110
/* Connect Initiate/Retransmit Initiate/Connect Confirm */
108
-
struct nsp_conn_init_msg
109
-
{
111
+
struct nsp_conn_init_msg {
110
112
__u8 msgflg;
111
113
#define NSP_CI 0x18 /* Connect Initiate */
112
114
#define NSP_RCI 0x68 /* Retrans. Conn Init */
···
120
126
} __attribute__((packed));
121
127
122
128
/* Disconnect Initiate/Disconnect Confirm */
123
-
struct nsp_disconn_init_msg
124
-
{
129
+
struct nsp_disconn_init_msg {
125
130
__u8 msgflg;
126
131
__le16 dstaddr;
127
132
__le16 srcaddr;
···
129
136
130
137
131
138
132
-
struct srcobj_fmt
133
-
{
139
+
struct srcobj_fmt {
134
140
__u8 format;
135
141
__u8 task;
136
142
__le16 grpcode;
+1
-2
include/net/dst.h
+1
-2
include/net/dst.h
+3
-6
include/net/fib_rules.h
+3
-6
include/net/fib_rules.h
···
7
7
#include <net/flow.h>
8
8
#include <net/rtnetlink.h>
9
9
10
-
struct fib_rule
11
-
{
10
+
struct fib_rule {
12
11
struct list_head list;
13
12
atomic_t refcnt;
14
13
int ifindex;
···
24
25
struct net * fr_net;
25
26
};
26
27
27
-
struct fib_lookup_arg
28
-
{
28
+
struct fib_lookup_arg {
29
29
void *lookup_ptr;
30
30
void *result;
31
31
struct fib_rule *rule;
32
32
};
33
33
34
-
struct fib_rules_ops
35
-
{
34
+
struct fib_rules_ops {
36
35
int family;
37
36
struct list_head list;
38
37
int rule_size;
+1
-2
include/net/gen_stats.h
+1
-2
include/net/gen_stats.h
+4
-8
include/net/genetlink.h
+4
-8
include/net/genetlink.h
···
13
13
* @list: list entry for linking
14
14
* @family: pointer to family, need not be set before registering
15
15
*/
16
-
struct genl_multicast_group
17
-
{
16
+
struct genl_multicast_group {
18
17
struct genl_family *family; /* private */
19
18
struct list_head list; /* private */
20
19
char name[GENL_NAMSIZ];
···
34
35
* @family_list: family list
35
36
* @mcast_groups: multicast groups list
36
37
*/
37
-
struct genl_family
38
-
{
38
+
struct genl_family {
39
39
unsigned int id;
40
40
unsigned int hdrsize;
41
41
char name[GENL_NAMSIZ];
···
56
58
* @userhdr: user specific header
57
59
* @attrs: netlink attributes
58
60
*/
59
-
struct genl_info
60
-
{
61
+
struct genl_info {
61
62
u32 snd_seq;
62
63
u32 snd_pid;
63
64
struct nlmsghdr * nlhdr;
···
99
102
* @done: completion callback for dumps
100
103
* @ops_list: operations list
101
104
*/
102
-
struct genl_ops
103
-
{
105
+
struct genl_ops {
104
106
u8 cmd;
105
107
unsigned int flags;
106
108
const struct nla_policy *policy;
+8
-16
include/net/if_inet6.h
+8
-16
include/net/if_inet6.h
···
32
32
33
33
#ifdef __KERNEL__
34
34
35
-
struct inet6_ifaddr
36
-
{
35
+
struct inet6_ifaddr {
37
36
struct in6_addr addr;
38
37
__u32 prefix_len;
39
38
···
66
67
int dead;
67
68
};
68
69
69
-
struct ip6_sf_socklist
70
-
{
70
+
struct ip6_sf_socklist {
71
71
unsigned int sl_max;
72
72
unsigned int sl_count;
73
73
struct in6_addr sl_addr[0];
···
77
79
78
80
#define IP6_SFBLOCK 10 /* allocate this many at once */
79
81
80
-
struct ipv6_mc_socklist
81
-
{
82
+
struct ipv6_mc_socklist {
82
83
struct in6_addr addr;
83
84
int ifindex;
84
85
struct ipv6_mc_socklist *next;
···
86
89
struct ip6_sf_socklist *sflist;
87
90
};
88
91
89
-
struct ip6_sf_list
90
-
{
92
+
struct ip6_sf_list {
91
93
struct ip6_sf_list *sf_next;
92
94
struct in6_addr sf_addr;
93
95
unsigned long sf_count[2]; /* include/exclude counts */
···
101
105
#define MAF_NOREPORT 0x08
102
106
#define MAF_GSQUERY 0x10
103
107
104
-
struct ifmcaddr6
105
-
{
108
+
struct ifmcaddr6 {
106
109
struct in6_addr mca_addr;
107
110
struct inet6_dev *idev;
108
111
struct ifmcaddr6 *next;
···
121
126
122
127
/* Anycast stuff */
123
128
124
-
struct ipv6_ac_socklist
125
-
{
129
+
struct ipv6_ac_socklist {
126
130
struct in6_addr acl_addr;
127
131
int acl_ifindex;
128
132
struct ipv6_ac_socklist *acl_next;
129
133
};
130
134
131
-
struct ifacaddr6
132
-
{
135
+
struct ifacaddr6 {
133
136
struct in6_addr aca_addr;
134
137
struct inet6_dev *aca_idev;
135
138
struct rt6_info *aca_rt;
···
150
157
DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg);
151
158
};
152
159
153
-
struct inet6_dev
154
-
{
160
+
struct inet6_dev {
155
161
struct net_device *dev;
156
162
157
163
struct inet6_ifaddr *addr_list;
+1
-2
include/net/inetpeer.h
+1
-2
include/net/inetpeer.h
+5
-10
include/net/ip.h
+5
-10
include/net/ip.h
···
33
33
34
34
struct sock;
35
35
36
-
struct inet_skb_parm
37
-
{
36
+
struct inet_skb_parm {
38
37
struct ip_options opt; /* Compiled IP options */
39
38
unsigned char flags;
40
39
···
49
50
return ip_hdr(skb)->ihl * 4;
50
51
}
51
52
52
-
struct ipcm_cookie
53
-
{
53
+
struct ipcm_cookie {
54
54
__be32 addr;
55
55
int oif;
56
56
struct ip_options *opt;
···
58
60
59
61
#define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))
60
62
61
-
struct ip_ra_chain
62
-
{
63
+
struct ip_ra_chain {
63
64
struct ip_ra_chain *next;
64
65
struct sock *sk;
65
66
void (*destructor)(struct sock *);
···
156
159
void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
157
160
unsigned int len);
158
161
159
-
struct ipv4_config
160
-
{
162
+
struct ipv4_config {
161
163
int log_martians;
162
164
int no_pmtu_disc;
163
165
};
···
332
336
* Functions provided by ip_fragment.c
333
337
*/
334
338
335
-
enum ip_defrag_users
336
-
{
339
+
enum ip_defrag_users {
337
340
IP_DEFRAG_LOCAL_DELIVER,
338
341
IP_DEFRAG_CALL_RA_CHAIN,
339
342
IP_DEFRAG_CONNTRACK_IN,
+5
-10
include/net/ip6_fib.h
+5
-10
include/net/ip6_fib.h
···
30
30
31
31
struct rt6_info;
32
32
33
-
struct fib6_config
34
-
{
33
+
struct fib6_config {
35
34
u32 fc_table;
36
35
u32 fc_metric;
37
36
int fc_dst_len;
···
50
51
struct nl_info fc_nlinfo;
51
52
};
52
53
53
-
struct fib6_node
54
-
{
54
+
struct fib6_node {
55
55
struct fib6_node *parent;
56
56
struct fib6_node *left;
57
57
struct fib6_node *right;
···
76
78
*
77
79
*/
78
80
79
-
struct rt6key
80
-
{
81
+
struct rt6key {
81
82
struct in6_addr addr;
82
83
int plen;
83
84
};
84
85
85
86
struct fib6_table;
86
87
87
-
struct rt6_info
88
-
{
88
+
struct rt6_info {
89
89
union {
90
90
struct dst_entry dst;
91
91
} u;
···
123
127
return ((struct rt6_info *)dst)->rt6i_idev;
124
128
}
125
129
126
-
struct fib6_walker_t
127
-
{
130
+
struct fib6_walker_t {
128
131
struct fib6_walker_t *prev, *next;
129
132
struct fib6_node *root, *node;
130
133
struct rt6_info *leaf;
+1
-2
include/net/ip6_route.h
+1
-2
include/net/ip6_route.h
+2
-4
include/net/ip_vs.h
+2
-4
include/net/ip_vs.h
···
251
251
u32 outbps;
252
252
};
253
253
254
-
struct ip_vs_stats
255
-
{
254
+
struct ip_vs_stats {
256
255
struct ip_vs_stats_user ustats; /* statistics */
257
256
struct ip_vs_estimator est; /* estimator */
258
257
···
517
518
/*
518
519
* The application module object (a.k.a. app incarnation)
519
520
*/
520
-
struct ip_vs_app
521
-
{
521
+
struct ip_vs_app {
522
522
struct list_head a_list; /* member in app list */
523
523
int type; /* IP_VS_APP_TYPE_xxx */
524
524
char *name; /* application module name */
+3
-6
include/net/ipip.h
+3
-6
include/net/ipip.h
···
8
8
#define IPTUNNEL_ERR_TIMEO (30*HZ)
9
9
10
10
/* 6rd prefix/relay information */
11
-
struct ip_tunnel_6rd_parm
12
-
{
11
+
struct ip_tunnel_6rd_parm {
13
12
struct in6_addr prefix;
14
13
__be32 relay_prefix;
15
14
u16 prefixlen;
16
15
u16 relay_prefixlen;
17
16
};
18
17
19
-
struct ip_tunnel
20
-
{
18
+
struct ip_tunnel {
21
19
struct ip_tunnel *next;
22
20
struct net_device *dev;
23
21
···
38
40
unsigned int prl_count; /* # of entries in PRL */
39
41
};
40
42
41
-
struct ip_tunnel_prl_entry
42
-
{
43
+
struct ip_tunnel_prl_entry {
43
44
struct ip_tunnel_prl_entry *next;
44
45
__be32 addr;
45
46
u16 flags;
+4
-8
include/net/ipv6.h
+4
-8
include/net/ipv6.h
···
160
160
#define ICMP6MSGIN_INC_STATS_BH(net, idev, field) \
161
161
_DEVINC(net, icmpv6msg, _BH, idev, field)
162
162
163
-
struct ip6_ra_chain
164
-
{
163
+
struct ip6_ra_chain {
165
164
struct ip6_ra_chain *next;
166
165
struct sock *sk;
167
166
int sel;
···
175
176
ancillary data and passed to IPv6.
176
177
*/
177
178
178
-
struct ipv6_txoptions
179
-
{
179
+
struct ipv6_txoptions {
180
180
/* Length of this structure */
181
181
int tot_len;
182
182
···
192
194
/* Option buffer, as read by IPV6_PKTOPTIONS, starts here. */
193
195
};
194
196
195
-
struct ip6_flowlabel
196
-
{
197
+
struct ip6_flowlabel {
197
198
struct ip6_flowlabel *next;
198
199
__be32 label;
199
200
atomic_t users;
···
209
212
#define IPV6_FLOWINFO_MASK cpu_to_be32(0x0FFFFFFF)
210
213
#define IPV6_FLOWLABEL_MASK cpu_to_be32(0x000FFFFF)
211
214
212
-
struct ipv6_fl_socklist
213
-
{
215
+
struct ipv6_fl_socklist {
214
216
struct ipv6_fl_socklist *next;
215
217
struct ip6_flowlabel *fl;
216
218
};
+4
-8
include/net/iw_handler.h
+4
-8
include/net/iw_handler.h
···
300
300
* This struct is also my long term insurance. I can add new fields here
301
301
* without breaking the prototype of iw_handler...
302
302
*/
303
-
struct iw_request_info
304
-
{
303
+
struct iw_request_info {
305
304
__u16 cmd; /* Wireless Extension command */
306
305
__u16 flags; /* More to come ;-) */
307
306
};
···
320
321
* shared by all driver instances... Same for the members...
321
322
* This will be linked from net_device in <linux/netdevice.h>
322
323
*/
323
-
struct iw_handler_def
324
-
{
324
+
struct iw_handler_def {
325
325
326
326
/* Array of handlers for standard ioctls
327
327
* We will call dev->wireless_handlers->standard[ioctl - SIOCSIWCOMMIT]
···
370
372
/*
371
373
* Describe how a standard IOCTL looks like.
372
374
*/
373
-
struct iw_ioctl_description
374
-
{
375
+
struct iw_ioctl_description {
375
376
__u8 header_type; /* NULL, iw_point or other */
376
377
__u8 token_type; /* Future */
377
378
__u16 token_size; /* Granularity of payload */
···
392
395
/*
393
396
* Instance specific spy data, i.e. addresses spied and quality for them.
394
397
*/
395
-
struct iw_spy_data
396
-
{
398
+
struct iw_spy_data {
397
399
/* --- Standard spy support --- */
398
400
int spy_number;
399
401
u_char spy_address[IW_MAX_SPY][ETH_ALEN];
+6
-12
include/net/neighbour.h
+6
-12
include/net/neighbour.h
···
37
37
38
38
struct neighbour;
39
39
40
-
struct neigh_parms
41
-
{
40
+
struct neigh_parms {
42
41
#ifdef CONFIG_NET_NS
43
42
struct net *net;
44
43
#endif
···
69
70
int locktime;
70
71
};
71
72
72
-
struct neigh_statistics
73
-
{
73
+
struct neigh_statistics {
74
74
unsigned long allocs; /* number of allocated neighs */
75
75
unsigned long destroys; /* number of destroyed neighs */
76
76
unsigned long hash_grows; /* number of hash resizes */
···
95
97
preempt_enable(); \
96
98
} while (0)
97
99
98
-
struct neighbour
99
-
{
100
+
struct neighbour {
100
101
struct neighbour *next;
101
102
struct neigh_table *tbl;
102
103
struct neigh_parms *parms;
···
119
122
u8 primary_key[0];
120
123
};
121
124
122
-
struct neigh_ops
123
-
{
125
+
struct neigh_ops {
124
126
int family;
125
127
void (*solicit)(struct neighbour *, struct sk_buff*);
126
128
void (*error_report)(struct neighbour *, struct sk_buff*);
···
129
133
int (*queue_xmit)(struct sk_buff*);
130
134
};
131
135
132
-
struct pneigh_entry
133
-
{
136
+
struct pneigh_entry {
134
137
struct pneigh_entry *next;
135
138
#ifdef CONFIG_NET_NS
136
139
struct net *net;
···
144
149
*/
145
150
146
151
147
-
struct neigh_table
148
-
{
152
+
struct neigh_table {
149
153
struct neigh_table *next;
150
154
int family;
151
155
int entry_size;
+1
-2
include/net/netfilter/nf_conntrack_ecache.h
+1
-2
include/net/netfilter/nf_conntrack_ecache.h
···
13
13
#include <net/netfilter/nf_conntrack_extend.h>
14
14
15
15
/* Connection tracking event types */
16
-
enum ip_conntrack_events
17
-
{
16
+
enum ip_conntrack_events {
18
17
IPCT_NEW = 0, /* new conntrack */
19
18
IPCT_RELATED = 1, /* related conntrack */
20
19
IPCT_DESTROY = 2, /* destroyed conntrack */
+2
-4
include/net/netfilter/nf_conntrack_expect.h
+2
-4
include/net/netfilter/nf_conntrack_expect.h
···
9
9
extern unsigned int nf_ct_expect_hsize;
10
10
extern unsigned int nf_ct_expect_max;
11
11
12
-
struct nf_conntrack_expect
13
-
{
12
+
struct nf_conntrack_expect {
14
13
/* Conntrack expectation list member */
15
14
struct hlist_node lnode;
16
15
···
63
64
#endif
64
65
}
65
66
66
-
struct nf_conntrack_expect_policy
67
-
{
67
+
struct nf_conntrack_expect_policy {
68
68
unsigned int max_expected;
69
69
unsigned int timeout;
70
70
};
+2
-4
include/net/netfilter/nf_conntrack_extend.h
+2
-4
include/net/netfilter/nf_conntrack_extend.h
···
3
3
4
4
#include <net/netfilter/nf_conntrack.h>
5
5
6
-
enum nf_ct_ext_id
7
-
{
6
+
enum nf_ct_ext_id {
8
7
NF_CT_EXT_HELPER,
9
8
NF_CT_EXT_NAT,
10
9
NF_CT_EXT_ACCT,
···
64
65
65
66
#define NF_CT_EXT_F_PREALLOC 0x0001
66
67
67
-
struct nf_ct_ext_type
68
-
{
68
+
struct nf_ct_ext_type {
69
69
/* Destroys relationships (can be NULL). */
70
70
void (*destroy)(struct nf_conn *ct);
71
71
/* Called when realloacted (can be NULL).
+1
-2
include/net/netfilter/nf_conntrack_helper.h
+1
-2
include/net/netfilter/nf_conntrack_helper.h
+1
-2
include/net/netfilter/nf_conntrack_l3proto.h
+1
-2
include/net/netfilter/nf_conntrack_l3proto.h
+1
-2
include/net/netfilter/nf_conntrack_l4proto.h
+1
-2
include/net/netfilter/nf_conntrack_l4proto.h
+4
-8
include/net/netfilter/nf_conntrack_tuple.h
+4
-8
include/net/netfilter/nf_conntrack_tuple.h
···
26
26
27
27
/* The protocol-specific manipulable parts of the tuple: always in
28
28
network order! */
29
-
union nf_conntrack_man_proto
30
-
{
29
+
union nf_conntrack_man_proto {
31
30
/* Add other protocols here. */
32
31
__be16 all;
33
32
···
51
52
};
52
53
53
54
/* The manipulable part of the tuple. */
54
-
struct nf_conntrack_man
55
-
{
55
+
struct nf_conntrack_man {
56
56
union nf_inet_addr u3;
57
57
union nf_conntrack_man_proto u;
58
58
/* Layer 3 protocol */
···
59
61
};
60
62
61
63
/* This contains the information to distinguish a connection. */
62
-
struct nf_conntrack_tuple
63
-
{
64
+
struct nf_conntrack_tuple {
64
65
struct nf_conntrack_man src;
65
66
66
67
/* These are the parts of the tuple which are fixed. */
···
97
100
} dst;
98
101
};
99
102
100
-
struct nf_conntrack_tuple_mask
101
-
{
103
+
struct nf_conntrack_tuple_mask {
102
104
struct {
103
105
union nf_inet_addr u3;
104
106
union nf_conntrack_man_proto u;
+5
-10
include/net/netfilter/nf_nat.h
+5
-10
include/net/netfilter/nf_nat.h
···
5
5
6
6
#define NF_NAT_MAPPING_TYPE_MAX_NAMELEN 16
7
7
8
-
enum nf_nat_manip_type
9
-
{
8
+
enum nf_nat_manip_type {
10
9
IP_NAT_MANIP_SRC,
11
10
IP_NAT_MANIP_DST
12
11
};
···
29
30
};
30
31
31
32
/* Single range specification. */
32
-
struct nf_nat_range
33
-
{
33
+
struct nf_nat_range {
34
34
/* Set to OR of flags above. */
35
35
unsigned int flags;
36
36
···
41
43
};
42
44
43
45
/* For backwards compat: don't use in modern code. */
44
-
struct nf_nat_multi_range_compat
45
-
{
46
+
struct nf_nat_multi_range_compat {
46
47
unsigned int rangesize; /* Must be 1. */
47
48
48
49
/* hangs off end. */
···
54
57
#include <net/netfilter/nf_conntrack_extend.h>
55
58
56
59
/* per conntrack: nat application helper private data */
57
-
union nf_conntrack_nat_help
58
-
{
60
+
union nf_conntrack_nat_help {
59
61
/* insert nat helper private data here */
60
62
struct nf_nat_pptp nat_pptp_info;
61
63
};
···
62
66
struct nf_conn;
63
67
64
68
/* The structure embedded in the conntrack structure. */
65
-
struct nf_conn_nat
66
-
{
69
+
struct nf_conn_nat {
67
70
struct hlist_node bysource;
68
71
struct nf_nat_seq seq[IP_CT_DIR_MAX];
69
72
struct nf_conn *ct;
+1
-2
include/net/netfilter/nf_nat_protocol.h
+1
-2
include/net/netfilter/nf_nat_protocol.h
+8
-16
include/net/pkt_cls.h
+8
-16
include/net/pkt_cls.h
···
7
7
8
8
/* Basic packet classifier frontend definitions. */
9
9
10
-
struct tcf_walker
11
-
{
10
+
struct tcf_walker {
12
11
int stop;
13
12
int skip;
14
13
int count;
···
60
61
tp->q->ops->cl_ops->unbind_tcf(tp->q, cl);
61
62
}
62
63
63
-
struct tcf_exts
64
-
{
64
+
struct tcf_exts {
65
65
#ifdef CONFIG_NET_CLS_ACT
66
66
struct tc_action *action;
67
67
#endif
···
69
71
/* Map to export classifier specific extension TLV types to the
70
72
* generic extensions API. Unsupported extensions must be set to 0.
71
73
*/
72
-
struct tcf_ext_map
73
-
{
74
+
struct tcf_ext_map {
74
75
int action;
75
76
int police;
76
77
};
···
140
143
/**
141
144
* struct tcf_pkt_info - packet information
142
145
*/
143
-
struct tcf_pkt_info
144
-
{
146
+
struct tcf_pkt_info {
145
147
unsigned char * ptr;
146
148
int nexthdr;
147
149
};
···
158
162
* @datalen: length of the ematch specific configuration data
159
163
* @data: ematch specific data
160
164
*/
161
-
struct tcf_ematch
162
-
{
165
+
struct tcf_ematch {
163
166
struct tcf_ematch_ops * ops;
164
167
unsigned long data;
165
168
unsigned int datalen;
···
206
211
* @hdr: ematch tree header supplied by userspace
207
212
* @matches: array of ematches
208
213
*/
209
-
struct tcf_ematch_tree
210
-
{
214
+
struct tcf_ematch_tree {
211
215
struct tcf_ematch_tree_hdr hdr;
212
216
struct tcf_ematch * matches;
213
217
···
224
230
* @owner: owner, must be set to THIS_MODULE
225
231
* @link: link to previous/next ematch module (internal use)
226
232
*/
227
-
struct tcf_ematch_ops
228
-
{
233
+
struct tcf_ematch_ops {
229
234
int kind;
230
235
int datalen;
231
236
int (*change)(struct tcf_proto *, void *,
···
295
302
296
303
#else /* CONFIG_NET_EMATCH */
297
304
298
-
struct tcf_ematch_tree
299
-
{
305
+
struct tcf_ematch_tree {
300
306
};
301
307
302
308
#define tcf_em_tree_validate(tp, tb, t) ((void)(t), 0)
+1
-2
include/net/pkt_sched.h
+1
-2
include/net/pkt_sched.h
+1
-2
include/net/protocol.h
+1
-2
include/net/protocol.h
+2
-4
include/net/red.h
+2
-4
include/net/red.h
···
90
90
#define RED_STAB_SIZE 256
91
91
#define RED_STAB_MASK (RED_STAB_SIZE - 1)
92
92
93
-
struct red_stats
94
-
{
93
+
struct red_stats {
95
94
u32 prob_drop; /* Early probability drops */
96
95
u32 prob_mark; /* Early probability marks */
97
96
u32 forced_drop; /* Forced drops, qavg > max_thresh */
···
100
101
u32 backlog;
101
102
};
102
103
103
-
struct red_parms
104
-
{
104
+
struct red_parms {
105
105
/* Parameters */
106
106
u32 qth_min; /* Min avg length threshold: A scaled */
107
107
u32 qth_max; /* Max avg length threshold: A scaled */
+4
-8
include/net/route.h
+4
-8
include/net/route.h
···
49
49
50
50
struct fib_nh;
51
51
struct inet_peer;
52
-
struct rtable
53
-
{
54
-
union
55
-
{
52
+
struct rtable {
53
+
union {
56
54
struct dst_entry dst;
57
55
} u;
58
56
···
75
77
struct inet_peer *peer; /* long-living peer info */
76
78
};
77
79
78
-
struct ip_rt_acct
79
-
{
80
+
struct ip_rt_acct {
80
81
__u32 o_bytes;
81
82
__u32 o_packets;
82
83
__u32 i_bytes;
83
84
__u32 i_packets;
84
85
};
85
86
86
-
struct rt_cache_stat
87
-
{
87
+
struct rt_cache_stat {
88
88
unsigned int in_hit;
89
89
unsigned int in_slow_tot;
90
90
unsigned int in_slow_mc;
+10
-20
include/net/sch_generic.h
+10
-20
include/net/sch_generic.h
···
15
15
struct tcf_walker;
16
16
struct module;
17
17
18
-
struct qdisc_rate_table
19
-
{
18
+
struct qdisc_rate_table {
20
19
struct tc_ratespec rate;
21
20
u32 data[256];
22
21
struct qdisc_rate_table *next;
23
22
int refcnt;
24
23
};
25
24
26
-
enum qdisc_state_t
27
-
{
25
+
enum qdisc_state_t {
28
26
__QDISC_STATE_RUNNING,
29
27
__QDISC_STATE_SCHED,
30
28
__QDISC_STATE_DEACTIVATED,
···
35
37
u16 data[];
36
38
};
37
39
38
-
struct Qdisc
39
-
{
40
+
struct Qdisc {
40
41
int (*enqueue)(struct sk_buff *skb, struct Qdisc *dev);
41
42
struct sk_buff * (*dequeue)(struct Qdisc *dev);
42
43
unsigned flags;
···
75
78
struct gnet_stats_queue qstats;
76
79
};
77
80
78
-
struct Qdisc_class_ops
79
-
{
81
+
struct Qdisc_class_ops {
80
82
/* Child qdisc manipulation */
81
83
struct netdev_queue * (*select_queue)(struct Qdisc *, struct tcmsg *);
82
84
int (*graft)(struct Qdisc *, unsigned long cl,
···
104
108
struct gnet_dump *);
105
109
};
106
110
107
-
struct Qdisc_ops
108
-
{
111
+
struct Qdisc_ops {
109
112
struct Qdisc_ops *next;
110
113
const struct Qdisc_class_ops *cl_ops;
111
114
char id[IFNAMSIZ];
···
128
133
};
129
134
130
135
131
-
struct tcf_result
132
-
{
136
+
struct tcf_result {
133
137
unsigned long class;
134
138
u32 classid;
135
139
};
136
140
137
-
struct tcf_proto_ops
138
-
{
141
+
struct tcf_proto_ops {
139
142
struct tcf_proto_ops *next;
140
143
char kind[IFNAMSIZ];
141
144
···
157
164
struct module *owner;
158
165
};
159
166
160
-
struct tcf_proto
161
-
{
167
+
struct tcf_proto {
162
168
/* Fast access part */
163
169
struct tcf_proto *next;
164
170
void *root;
···
253
261
extern struct Qdisc_ops pfifo_fast_ops;
254
262
extern struct Qdisc_ops mq_qdisc_ops;
255
263
256
-
struct Qdisc_class_common
257
-
{
264
+
struct Qdisc_class_common {
258
265
u32 classid;
259
266
struct hlist_node hnode;
260
267
};
261
268
262
-
struct Qdisc_class_hash
263
-
{
269
+
struct Qdisc_class_hash {
264
270
struct hlist_head *hash;
265
271
unsigned int hashsize;
266
272
unsigned int hashmask;
+3
-6
include/net/scm.h
+3
-6
include/net/scm.h
···
12
12
*/
13
13
#define SCM_MAX_FD 255
14
14
15
-
struct scm_fp_list
16
-
{
15
+
struct scm_fp_list {
17
16
struct list_head list;
18
17
int count;
19
18
struct file *fp[SCM_MAX_FD];
20
19
};
21
20
22
-
struct scm_cookie
23
-
{
21
+
struct scm_cookie {
24
22
struct ucred creds; /* Skb credentials */
25
23
struct scm_fp_list *fp; /* Passed files */
26
24
#ifdef CONFIG_SECURITY_NETWORK
···
86
88
static __inline__ void scm_recv(struct socket *sock, struct msghdr *msg,
87
89
struct scm_cookie *scm, int flags)
88
90
{
89
-
if (!msg->msg_control)
90
-
{
91
+
if (!msg->msg_control) {
91
92
if (test_bit(SOCK_PASSCRED, &sock->flags) || scm->fp)
92
93
msg->msg_flags |= MSG_CTRUNC;
93
94
scm_destroy(scm);
+1
-2
include/net/sctp/sctp.h
+1
-2
include/net/sctp/sctp.h
+1
-2
include/net/tcp.h
+1
-2
include/net/tcp.h
+9
-18
include/net/xfrm.h
+9
-18
include/net/xfrm.h
···
121
121
};
122
122
123
123
/* Full description of state of transformer. */
124
-
struct xfrm_state
125
-
{
124
+
struct xfrm_state {
126
125
#ifdef CONFIG_NET_NS
127
126
struct net *xs_net;
128
127
#endif
···
236
237
};
237
238
238
239
/* callback structure passed from either netlink or pfkey */
239
-
struct km_event
240
-
{
240
+
struct km_event {
241
241
union {
242
242
u32 hard;
243
243
u32 proto;
···
311
313
312
314
extern void xfrm_state_delete_tunnel(struct xfrm_state *x);
313
315
314
-
struct xfrm_type
315
-
{
316
+
struct xfrm_type {
316
317
char *description;
317
318
struct module *owner;
318
319
__u8 proto;
···
417
420
return x->inner_mode_iaf;
418
421
}
419
422
420
-
struct xfrm_tmpl
421
-
{
423
+
struct xfrm_tmpl {
422
424
/* id in template is interpreted as:
423
425
* daddr - destination of tunnel, may be zero for transport mode.
424
426
* spi - zero to acquire spi. Not zero if spi is static, then
···
464
468
u32 seq;
465
469
};
466
470
467
-
struct xfrm_policy
468
-
{
471
+
struct xfrm_policy {
469
472
#ifdef CONFIG_NET_NS
470
473
struct net *xp_net;
471
474
#endif
···
533
538
/* default seq threshold size */
534
539
#define XFRM_AE_SEQT_SIZE 2
535
540
536
-
struct xfrm_mgr
537
-
{
541
+
struct xfrm_mgr {
538
542
struct list_head list;
539
543
char *id;
540
544
int (*notify)(struct xfrm_state *x, struct km_event *c);
···
620
626
#define XFRM_SPI_SKB_CB(__skb) ((struct xfrm_spi_skb_cb *)&((__skb)->cb[0]))
621
627
622
628
/* Audit Information */
623
-
struct xfrm_audit
624
-
{
629
+
struct xfrm_audit {
625
630
u32 secid;
626
631
uid_t loginuid;
627
632
u32 sessionid;
···
864
871
* bundles differing by session id. All the bundles grow from a parent
865
872
* policy rule.
866
873
*/
867
-
struct xfrm_dst
868
-
{
874
+
struct xfrm_dst {
869
875
union {
870
876
struct dst_entry dst;
871
877
struct rtable rt;
···
899
907
900
908
extern void xfrm_dst_ifdown(struct dst_entry *dst, struct net_device *dev);
901
909
902
-
struct sec_path
903
-
{
910
+
struct sec_path {
904
911
atomic_t refcnt;
905
912
int len;
906
913
struct xfrm_state *xvec[XFRM_MAX_DEPTH];