diff options
Diffstat (limited to 'net/netlabel/netlabel_unlabeled.c')
-rw-r--r-- | net/netlabel/netlabel_unlabeled.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index c92894c3e40a..6b1b6c2b5141 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c | |||
@@ -1318,56 +1318,48 @@ static const struct genl_ops netlbl_unlabel_genl_ops[] = { | |||
1318 | { | 1318 | { |
1319 | .cmd = NLBL_UNLABEL_C_STATICADD, | 1319 | .cmd = NLBL_UNLABEL_C_STATICADD, |
1320 | .flags = GENL_ADMIN_PERM, | 1320 | .flags = GENL_ADMIN_PERM, |
1321 | .policy = netlbl_unlabel_genl_policy, | ||
1322 | .doit = netlbl_unlabel_staticadd, | 1321 | .doit = netlbl_unlabel_staticadd, |
1323 | .dumpit = NULL, | 1322 | .dumpit = NULL, |
1324 | }, | 1323 | }, |
1325 | { | 1324 | { |
1326 | .cmd = NLBL_UNLABEL_C_STATICREMOVE, | 1325 | .cmd = NLBL_UNLABEL_C_STATICREMOVE, |
1327 | .flags = GENL_ADMIN_PERM, | 1326 | .flags = GENL_ADMIN_PERM, |
1328 | .policy = netlbl_unlabel_genl_policy, | ||
1329 | .doit = netlbl_unlabel_staticremove, | 1327 | .doit = netlbl_unlabel_staticremove, |
1330 | .dumpit = NULL, | 1328 | .dumpit = NULL, |
1331 | }, | 1329 | }, |
1332 | { | 1330 | { |
1333 | .cmd = NLBL_UNLABEL_C_STATICLIST, | 1331 | .cmd = NLBL_UNLABEL_C_STATICLIST, |
1334 | .flags = 0, | 1332 | .flags = 0, |
1335 | .policy = netlbl_unlabel_genl_policy, | ||
1336 | .doit = NULL, | 1333 | .doit = NULL, |
1337 | .dumpit = netlbl_unlabel_staticlist, | 1334 | .dumpit = netlbl_unlabel_staticlist, |
1338 | }, | 1335 | }, |
1339 | { | 1336 | { |
1340 | .cmd = NLBL_UNLABEL_C_STATICADDDEF, | 1337 | .cmd = NLBL_UNLABEL_C_STATICADDDEF, |
1341 | .flags = GENL_ADMIN_PERM, | 1338 | .flags = GENL_ADMIN_PERM, |
1342 | .policy = netlbl_unlabel_genl_policy, | ||
1343 | .doit = netlbl_unlabel_staticadddef, | 1339 | .doit = netlbl_unlabel_staticadddef, |
1344 | .dumpit = NULL, | 1340 | .dumpit = NULL, |
1345 | }, | 1341 | }, |
1346 | { | 1342 | { |
1347 | .cmd = NLBL_UNLABEL_C_STATICREMOVEDEF, | 1343 | .cmd = NLBL_UNLABEL_C_STATICREMOVEDEF, |
1348 | .flags = GENL_ADMIN_PERM, | 1344 | .flags = GENL_ADMIN_PERM, |
1349 | .policy = netlbl_unlabel_genl_policy, | ||
1350 | .doit = netlbl_unlabel_staticremovedef, | 1345 | .doit = netlbl_unlabel_staticremovedef, |
1351 | .dumpit = NULL, | 1346 | .dumpit = NULL, |
1352 | }, | 1347 | }, |
1353 | { | 1348 | { |
1354 | .cmd = NLBL_UNLABEL_C_STATICLISTDEF, | 1349 | .cmd = NLBL_UNLABEL_C_STATICLISTDEF, |
1355 | .flags = 0, | 1350 | .flags = 0, |
1356 | .policy = netlbl_unlabel_genl_policy, | ||
1357 | .doit = NULL, | 1351 | .doit = NULL, |
1358 | .dumpit = netlbl_unlabel_staticlistdef, | 1352 | .dumpit = netlbl_unlabel_staticlistdef, |
1359 | }, | 1353 | }, |
1360 | { | 1354 | { |
1361 | .cmd = NLBL_UNLABEL_C_ACCEPT, | 1355 | .cmd = NLBL_UNLABEL_C_ACCEPT, |
1362 | .flags = GENL_ADMIN_PERM, | 1356 | .flags = GENL_ADMIN_PERM, |
1363 | .policy = netlbl_unlabel_genl_policy, | ||
1364 | .doit = netlbl_unlabel_accept, | 1357 | .doit = netlbl_unlabel_accept, |
1365 | .dumpit = NULL, | 1358 | .dumpit = NULL, |
1366 | }, | 1359 | }, |
1367 | { | 1360 | { |
1368 | .cmd = NLBL_UNLABEL_C_LIST, | 1361 | .cmd = NLBL_UNLABEL_C_LIST, |
1369 | .flags = 0, | 1362 | .flags = 0, |
1370 | .policy = netlbl_unlabel_genl_policy, | ||
1371 | .doit = netlbl_unlabel_list, | 1363 | .doit = netlbl_unlabel_list, |
1372 | .dumpit = NULL, | 1364 | .dumpit = NULL, |
1373 | }, | 1365 | }, |
@@ -1378,6 +1370,7 @@ static struct genl_family netlbl_unlabel_gnl_family __ro_after_init = { | |||
1378 | .name = NETLBL_NLTYPE_UNLABELED_NAME, | 1370 | .name = NETLBL_NLTYPE_UNLABELED_NAME, |
1379 | .version = NETLBL_PROTO_VERSION, | 1371 | .version = NETLBL_PROTO_VERSION, |
1380 | .maxattr = NLBL_UNLABEL_A_MAX, | 1372 | .maxattr = NLBL_UNLABEL_A_MAX, |
1373 | .policy = netlbl_unlabel_genl_policy, | ||
1381 | .module = THIS_MODULE, | 1374 | .module = THIS_MODULE, |
1382 | .ops = netlbl_unlabel_genl_ops, | 1375 | .ops = netlbl_unlabel_genl_ops, |
1383 | .n_ops = ARRAY_SIZE(netlbl_unlabel_genl_ops), | 1376 | .n_ops = ARRAY_SIZE(netlbl_unlabel_genl_ops), |