diff options
Diffstat (limited to 'net/tipc')
-rw-r--r-- | net/tipc/netlink.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index 5240f64e8ccc..2d178df0a89f 100644 --- a/net/tipc/netlink.c +++ b/net/tipc/netlink.c | |||
@@ -144,114 +144,93 @@ static const struct genl_ops tipc_genl_v2_ops[] = { | |||
144 | { | 144 | { |
145 | .cmd = TIPC_NL_BEARER_DISABLE, | 145 | .cmd = TIPC_NL_BEARER_DISABLE, |
146 | .doit = tipc_nl_bearer_disable, | 146 | .doit = tipc_nl_bearer_disable, |
147 | .policy = tipc_nl_policy, | ||
148 | }, | 147 | }, |
149 | { | 148 | { |
150 | .cmd = TIPC_NL_BEARER_ENABLE, | 149 | .cmd = TIPC_NL_BEARER_ENABLE, |
151 | .doit = tipc_nl_bearer_enable, | 150 | .doit = tipc_nl_bearer_enable, |
152 | .policy = tipc_nl_policy, | ||
153 | }, | 151 | }, |
154 | { | 152 | { |
155 | .cmd = TIPC_NL_BEARER_GET, | 153 | .cmd = TIPC_NL_BEARER_GET, |
156 | .doit = tipc_nl_bearer_get, | 154 | .doit = tipc_nl_bearer_get, |
157 | .dumpit = tipc_nl_bearer_dump, | 155 | .dumpit = tipc_nl_bearer_dump, |
158 | .policy = tipc_nl_policy, | ||
159 | }, | 156 | }, |
160 | { | 157 | { |
161 | .cmd = TIPC_NL_BEARER_ADD, | 158 | .cmd = TIPC_NL_BEARER_ADD, |
162 | .doit = tipc_nl_bearer_add, | 159 | .doit = tipc_nl_bearer_add, |
163 | .policy = tipc_nl_policy, | ||
164 | }, | 160 | }, |
165 | { | 161 | { |
166 | .cmd = TIPC_NL_BEARER_SET, | 162 | .cmd = TIPC_NL_BEARER_SET, |
167 | .doit = tipc_nl_bearer_set, | 163 | .doit = tipc_nl_bearer_set, |
168 | .policy = tipc_nl_policy, | ||
169 | }, | 164 | }, |
170 | { | 165 | { |
171 | .cmd = TIPC_NL_SOCK_GET, | 166 | .cmd = TIPC_NL_SOCK_GET, |
172 | .start = tipc_dump_start, | 167 | .start = tipc_dump_start, |
173 | .dumpit = tipc_nl_sk_dump, | 168 | .dumpit = tipc_nl_sk_dump, |
174 | .done = tipc_dump_done, | 169 | .done = tipc_dump_done, |
175 | .policy = tipc_nl_policy, | ||
176 | }, | 170 | }, |
177 | { | 171 | { |
178 | .cmd = TIPC_NL_PUBL_GET, | 172 | .cmd = TIPC_NL_PUBL_GET, |
179 | .dumpit = tipc_nl_publ_dump, | 173 | .dumpit = tipc_nl_publ_dump, |
180 | .policy = tipc_nl_policy, | ||
181 | }, | 174 | }, |
182 | { | 175 | { |
183 | .cmd = TIPC_NL_LINK_GET, | 176 | .cmd = TIPC_NL_LINK_GET, |
184 | .doit = tipc_nl_node_get_link, | 177 | .doit = tipc_nl_node_get_link, |
185 | .dumpit = tipc_nl_node_dump_link, | 178 | .dumpit = tipc_nl_node_dump_link, |
186 | .policy = tipc_nl_policy, | ||
187 | }, | 179 | }, |
188 | { | 180 | { |
189 | .cmd = TIPC_NL_LINK_SET, | 181 | .cmd = TIPC_NL_LINK_SET, |
190 | .doit = tipc_nl_node_set_link, | 182 | .doit = tipc_nl_node_set_link, |
191 | .policy = tipc_nl_policy, | ||
192 | }, | 183 | }, |
193 | { | 184 | { |
194 | .cmd = TIPC_NL_LINK_RESET_STATS, | 185 | .cmd = TIPC_NL_LINK_RESET_STATS, |
195 | .doit = tipc_nl_node_reset_link_stats, | 186 | .doit = tipc_nl_node_reset_link_stats, |
196 | .policy = tipc_nl_policy, | ||
197 | }, | 187 | }, |
198 | { | 188 | { |
199 | .cmd = TIPC_NL_MEDIA_GET, | 189 | .cmd = TIPC_NL_MEDIA_GET, |
200 | .doit = tipc_nl_media_get, | 190 | .doit = tipc_nl_media_get, |
201 | .dumpit = tipc_nl_media_dump, | 191 | .dumpit = tipc_nl_media_dump, |
202 | .policy = tipc_nl_policy, | ||
203 | }, | 192 | }, |
204 | { | 193 | { |
205 | .cmd = TIPC_NL_MEDIA_SET, | 194 | .cmd = TIPC_NL_MEDIA_SET, |
206 | .doit = tipc_nl_media_set, | 195 | .doit = tipc_nl_media_set, |
207 | .policy = tipc_nl_policy, | ||
208 | }, | 196 | }, |
209 | { | 197 | { |
210 | .cmd = TIPC_NL_NODE_GET, | 198 | .cmd = TIPC_NL_NODE_GET, |
211 | .dumpit = tipc_nl_node_dump, | 199 | .dumpit = tipc_nl_node_dump, |
212 | .policy = tipc_nl_policy, | ||
213 | }, | 200 | }, |
214 | { | 201 | { |
215 | .cmd = TIPC_NL_NET_GET, | 202 | .cmd = TIPC_NL_NET_GET, |
216 | .dumpit = tipc_nl_net_dump, | 203 | .dumpit = tipc_nl_net_dump, |
217 | .policy = tipc_nl_policy, | ||
218 | }, | 204 | }, |
219 | { | 205 | { |
220 | .cmd = TIPC_NL_NET_SET, | 206 | .cmd = TIPC_NL_NET_SET, |
221 | .doit = tipc_nl_net_set, | 207 | .doit = tipc_nl_net_set, |
222 | .policy = tipc_nl_policy, | ||
223 | }, | 208 | }, |
224 | { | 209 | { |
225 | .cmd = TIPC_NL_NAME_TABLE_GET, | 210 | .cmd = TIPC_NL_NAME_TABLE_GET, |
226 | .dumpit = tipc_nl_name_table_dump, | 211 | .dumpit = tipc_nl_name_table_dump, |
227 | .policy = tipc_nl_policy, | ||
228 | }, | 212 | }, |
229 | { | 213 | { |
230 | .cmd = TIPC_NL_MON_SET, | 214 | .cmd = TIPC_NL_MON_SET, |
231 | .doit = tipc_nl_node_set_monitor, | 215 | .doit = tipc_nl_node_set_monitor, |
232 | .policy = tipc_nl_policy, | ||
233 | }, | 216 | }, |
234 | { | 217 | { |
235 | .cmd = TIPC_NL_MON_GET, | 218 | .cmd = TIPC_NL_MON_GET, |
236 | .doit = tipc_nl_node_get_monitor, | 219 | .doit = tipc_nl_node_get_monitor, |
237 | .dumpit = tipc_nl_node_dump_monitor, | 220 | .dumpit = tipc_nl_node_dump_monitor, |
238 | .policy = tipc_nl_policy, | ||
239 | }, | 221 | }, |
240 | { | 222 | { |
241 | .cmd = TIPC_NL_MON_PEER_GET, | 223 | .cmd = TIPC_NL_MON_PEER_GET, |
242 | .dumpit = tipc_nl_node_dump_monitor_peer, | 224 | .dumpit = tipc_nl_node_dump_monitor_peer, |
243 | .policy = tipc_nl_policy, | ||
244 | }, | 225 | }, |
245 | { | 226 | { |
246 | .cmd = TIPC_NL_PEER_REMOVE, | 227 | .cmd = TIPC_NL_PEER_REMOVE, |
247 | .doit = tipc_nl_peer_rm, | 228 | .doit = tipc_nl_peer_rm, |
248 | .policy = tipc_nl_policy, | ||
249 | }, | 229 | }, |
250 | #ifdef CONFIG_TIPC_MEDIA_UDP | 230 | #ifdef CONFIG_TIPC_MEDIA_UDP |
251 | { | 231 | { |
252 | .cmd = TIPC_NL_UDP_GET_REMOTEIP, | 232 | .cmd = TIPC_NL_UDP_GET_REMOTEIP, |
253 | .dumpit = tipc_udp_nl_dump_remoteip, | 233 | .dumpit = tipc_udp_nl_dump_remoteip, |
254 | .policy = tipc_nl_policy, | ||
255 | }, | 234 | }, |
256 | #endif | 235 | #endif |
257 | }; | 236 | }; |
@@ -261,6 +240,7 @@ struct genl_family tipc_genl_family __ro_after_init = { | |||
261 | .version = TIPC_GENL_V2_VERSION, | 240 | .version = TIPC_GENL_V2_VERSION, |
262 | .hdrsize = 0, | 241 | .hdrsize = 0, |
263 | .maxattr = TIPC_NLA_MAX, | 242 | .maxattr = TIPC_NLA_MAX, |
243 | .policy = tipc_nl_policy, | ||
264 | .netnsok = true, | 244 | .netnsok = true, |
265 | .module = THIS_MODULE, | 245 | .module = THIS_MODULE, |
266 | .ops = tipc_genl_v2_ops, | 246 | .ops = tipc_genl_v2_ops, |