diff options
Diffstat (limited to 'include/net/neighbour.h')
-rw-r--r-- | include/net/neighbour.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 3817fda82a8..0302f31a2fb 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; |
@@ -264,8 +258,7 @@ extern int neigh_sysctl_register(struct net_device *dev, | |||
264 | struct neigh_parms *p, | 258 | struct neigh_parms *p, |
265 | int p_id, int pdev_id, | 259 | int p_id, int pdev_id, |
266 | char *p_name, | 260 | char *p_name, |
267 | proc_handler *proc_handler, | 261 | proc_handler *proc_handler); |
268 | ctl_handler *strategy); | ||
269 | extern void neigh_sysctl_unregister(struct neigh_parms *p); | 262 | extern void neigh_sysctl_unregister(struct neigh_parms *p); |
270 | 263 | ||
271 | static inline void __neigh_parms_put(struct neigh_parms *parms) | 264 | static inline void __neigh_parms_put(struct neigh_parms *parms) |