Skip to content

Commit fd2c3ef

Browse files
Eric Dumazetdavem330
Eric Dumazet
authored and
davem330
committed
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>
1 parent 4b7673a commit fd2c3ef

37 files changed

Lines changed: 120 additions & 240 deletions

‎include/net/ah.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
struct crypto_ahash;
1010

11-
struct ah_data
12-
{
11+
struct ah_data {
1312
int icv_full_len;
1413
int icv_trunc_len;
1514

‎include/net/dn_dev.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,14 @@ struct dn_dev {
9797
unsigned long uptime; /* Time device went up in jiffies */
9898
};
9999

100-
struct dn_short_packet
101-
{
100+
struct dn_short_packet {
102101
__u8 msgflg;
103102
__le16 dstnode;
104103
__le16 srcnode;
105104
__u8 forward;
106105
} __attribute__((packed));
107106

108-
struct dn_long_packet
109-
{
107+
struct dn_long_packet {
110108
__u8 msgflg;
111109
__u8 d_area;
112110
__u8 d_subarea;
@@ -122,8 +120,7 @@ struct dn_long_packet
122120

123121
/*------------------------- DRP - Routing messages ---------------------*/
124122

125-
struct endnode_hello_message
126-
{
123+
struct endnode_hello_message {
127124
__u8 msgflg;
128125
__u8 tiver[3];
129126
__u8 id[6];
@@ -138,8 +135,7 @@ struct endnode_hello_message
138135
__u8 data[2];
139136
} __attribute__((packed));
140137

141-
struct rtnode_hello_message
142-
{
138+
struct rtnode_hello_message {
143139
__u8 msgflg;
144140
__u8 tiver[3];
145141
__u8 id[6];

‎include/net/dn_fib.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
/* WARNING: The ordering of these elements must match ordering
55
* of RTA_* rtnetlink attribute numbers.
66
*/
7-
struct dn_kern_rta
8-
{
7+
struct dn_kern_rta {
98
void *rta_dst;
109
void *rta_src;
1110
int *rta_iif;

‎include/net/dn_nsp.h‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,47 +70,41 @@ extern struct sk_buff *dn_alloc_send_skb(struct sock *sk, size_t *size, int nobl
7070

7171
/* Data Messages (data segment/interrupt/link service) */
7272

73-
struct nsp_data_seg_msg
74-
{
73+
struct nsp_data_seg_msg {
7574
__u8 msgflg;
7675
__le16 dstaddr;
7776
__le16 srcaddr;
7877
} __attribute__((packed));
7978

80-
struct nsp_data_opt_msg
81-
{
79+
struct nsp_data_opt_msg {
8280
__le16 acknum;
8381
__le16 segnum;
8482
__le16 lsflgs;
8583
} __attribute__((packed));
8684

87-
struct nsp_data_opt_msg1
88-
{
85+
struct nsp_data_opt_msg1 {
8986
__le16 acknum;
9087
__le16 segnum;
9188
} __attribute__((packed));
9289

9390

9491
/* Acknowledgment Message (data/other data) */
95-
struct nsp_data_ack_msg
96-
{
92+
struct nsp_data_ack_msg {
9793
__u8 msgflg;
9894
__le16 dstaddr;
9995
__le16 srcaddr;
10096
__le16 acknum;
10197
} __attribute__((packed));
10298

10399
/* Connect Acknowledgment Message */
104-
struct nsp_conn_ack_msg
105-
{
100+
struct nsp_conn_ack_msg {
106101
__u8 msgflg;
107102
__le16 dstaddr;
108103
} __attribute__((packed));
109104

110105

111106
/* Connect Initiate/Retransmit Initiate/Connect Confirm */
112-
struct nsp_conn_init_msg
113-
{
107+
struct nsp_conn_init_msg {
114108
__u8 msgflg;
115109
#define NSP_CI 0x18 /* Connect Initiate */
116110
#define NSP_RCI 0x68 /* Retrans. Conn Init */
@@ -126,8 +120,7 @@ struct nsp_conn_init_msg
126120
} __attribute__((packed));
127121

128122
/* Disconnect Initiate/Disconnect Confirm */
129-
struct nsp_disconn_init_msg
130-
{
123+
struct nsp_disconn_init_msg {
131124
__u8 msgflg;
132125
__le16 dstaddr;
133126
__le16 srcaddr;
@@ -136,8 +129,7 @@ struct nsp_disconn_init_msg
136129

137130

138131

139-
struct srcobj_fmt
140-
{
132+
struct srcobj_fmt {
141133
__u8 format;
142134
__u8 task;
143135
__le16 grpcode;

‎include/net/dst.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636

3737
struct sk_buff;
3838

39-
struct dst_entry
40-
{
39+
struct dst_entry {
4140
struct rcu_head rcu_head;
4241
struct dst_entry *child;
4342
struct net_device *dev;

‎include/net/fib_rules.h‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
#include <net/flow.h>
88
#include <net/rtnetlink.h>
99

10-
struct fib_rule
11-
{
10+
struct fib_rule {
1211
struct list_head list;
1312
atomic_t refcnt;
1413
int ifindex;
@@ -25,15 +24,13 @@ struct fib_rule
2524
struct net * fr_net;
2625
};
2726

28-
struct fib_lookup_arg
29-
{
27+
struct fib_lookup_arg {
3028
void *lookup_ptr;
3129
void *result;
3230
struct fib_rule *rule;
3331
};
3432

35-
struct fib_rules_ops
36-
{
33+
struct fib_rules_ops {
3734
int family;
3835
struct list_head list;
3936
int rule_size;

‎include/net/gen_stats.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
#include <linux/rtnetlink.h>
77
#include <linux/pkt_sched.h>
88

9-
struct gnet_dump
10-
{
9+
struct gnet_dump {
1110
spinlock_t * lock;
1211
struct sk_buff * skb;
1312
struct nlattr * tail;

‎include/net/genetlink.h‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
* @list: list entry for linking
1414
* @family: pointer to family, need not be set before registering
1515
*/
16-
struct genl_multicast_group
17-
{
16+
struct genl_multicast_group {
1817
struct genl_family *family; /* private */
1918
struct list_head list; /* private */
2019
char name[GENL_NAMSIZ];
@@ -35,8 +34,7 @@ struct genl_multicast_group
3534
* @family_list: family list
3635
* @mcast_groups: multicast groups list
3736
*/
38-
struct genl_family
39-
{
37+
struct genl_family {
4038
unsigned int id;
4139
unsigned int hdrsize;
4240
char name[GENL_NAMSIZ];
@@ -58,8 +56,7 @@ struct genl_family
5856
* @userhdr: user specific header
5957
* @attrs: netlink attributes
6058
*/
61-
struct genl_info
62-
{
59+
struct genl_info {
6360
u32 snd_seq;
6461
u32 snd_pid;
6562
struct nlmsghdr * nlhdr;
@@ -102,8 +99,7 @@ static inline void genl_info_net_set(struct genl_info *info, struct net *net)
10299
* @done: completion callback for dumps
103100
* @ops_list: operations list
104101
*/
105-
struct genl_ops
106-
{
102+
struct genl_ops {
107103
u8 cmd;
108104
unsigned int flags;
109105
const struct nla_policy *policy;

‎include/net/if_inet6.h‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232

3333
#ifdef __KERNEL__
3434

35-
struct inet6_ifaddr
36-
{
35+
struct inet6_ifaddr {
3736
struct in6_addr addr;
3837
__u32 prefix_len;
3938

@@ -67,8 +66,7 @@ struct inet6_ifaddr
6766
int dead;
6867
};
6968

70-
struct ip6_sf_socklist
71-
{
69+
struct ip6_sf_socklist {
7270
unsigned int sl_max;
7371
unsigned int sl_count;
7472
struct in6_addr sl_addr[0];
@@ -79,8 +77,7 @@ struct ip6_sf_socklist
7977

8078
#define IP6_SFBLOCK 10 /* allocate this many at once */
8179

82-
struct ipv6_mc_socklist
83-
{
80+
struct ipv6_mc_socklist {
8481
struct in6_addr addr;
8582
int ifindex;
8683
struct ipv6_mc_socklist *next;
@@ -89,8 +86,7 @@ struct ipv6_mc_socklist
8986
struct ip6_sf_socklist *sflist;
9087
};
9188

92-
struct ip6_sf_list
93-
{
89+
struct ip6_sf_list {
9490
struct ip6_sf_list *sf_next;
9591
struct in6_addr sf_addr;
9692
unsigned long sf_count[2]; /* include/exclude counts */
@@ -105,8 +101,7 @@ struct ip6_sf_list
105101
#define MAF_NOREPORT 0x08
106102
#define MAF_GSQUERY 0x10
107103

108-
struct ifmcaddr6
109-
{
104+
struct ifmcaddr6 {
110105
struct in6_addr mca_addr;
111106
struct inet6_dev *idev;
112107
struct ifmcaddr6 *next;
@@ -126,15 +121,13 @@ struct ifmcaddr6
126121

127122
/* Anycast stuff */
128123

129-
struct ipv6_ac_socklist
130-
{
124+
struct ipv6_ac_socklist {
131125
struct in6_addr acl_addr;
132126
int acl_ifindex;
133127
struct ipv6_ac_socklist *acl_next;
134128
};
135129

136-
struct ifacaddr6
137-
{
130+
struct ifacaddr6 {
138131
struct in6_addr aca_addr;
139132
struct inet6_dev *aca_idev;
140133
struct rt6_info *aca_rt;
@@ -157,8 +150,7 @@ struct ipv6_devstat {
157150
DEFINE_SNMP_STAT(struct icmpv6msg_mib, icmpv6msg);
158151
};
159152

160-
struct inet6_dev
161-
{
153+
struct inet6_dev {
162154
struct net_device *dev;
163155

164156
struct inet6_ifaddr *addr_list;

‎include/net/inetpeer.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
#include <linux/spinlock.h>
1414
#include <asm/atomic.h>
1515

16-
struct inet_peer
17-
{
16+
struct inet_peer {
1817
/* group together avl_left,avl_right,v4daddr to speedup lookups */
1918
struct inet_peer *avl_left, *avl_right;
2019
__be32 v4daddr; /* peer's address */

0 commit comments

Comments
 (0)