diff options
-rw-r--r-- | kernel/sysctl_binary.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c index 0cf60400542d..b75dbf40f573 100644 --- a/kernel/sysctl_binary.c +++ b/kernel/sysctl_binary.c | |||
@@ -1269,17 +1269,12 @@ repeat: | |||
1269 | for ( ; table->convert; table++) { | 1269 | for ( ; table->convert; table++) { |
1270 | int len = 0; | 1270 | int len = 0; |
1271 | 1271 | ||
1272 | /* Use the well known sysctl number to proc name mapping */ | ||
1273 | if (ctl_name == table->ctl_name) { | ||
1274 | len = strlen(table->procname); | ||
1275 | memcpy(path, table->procname, len); | ||
1276 | } | ||
1277 | #ifdef CONFIG_NET | ||
1278 | /* | 1272 | /* |
1279 | * For a wild card entry map from ifindex to network | 1273 | * For a wild card entry map from ifindex to network |
1280 | * device name. | 1274 | * device name. |
1281 | */ | 1275 | */ |
1282 | else if (!table->ctl_name) { | 1276 | if (!table->ctl_name) { |
1277 | #ifdef CONFIG_NET | ||
1283 | struct net *net = current->nsproxy->net_ns; | 1278 | struct net *net = current->nsproxy->net_ns; |
1284 | struct net_device *dev; | 1279 | struct net_device *dev; |
1285 | dev = dev_get_by_index(net, ctl_name); | 1280 | dev = dev_get_by_index(net, ctl_name); |
@@ -1288,8 +1283,12 @@ repeat: | |||
1288 | memcpy(path, dev->name, len); | 1283 | memcpy(path, dev->name, len); |
1289 | dev_put(dev); | 1284 | dev_put(dev); |
1290 | } | 1285 | } |
1291 | } | ||
1292 | #endif | 1286 | #endif |
1287 | /* Use the well known sysctl number to proc name mapping */ | ||
1288 | } else if (ctl_name == table->ctl_name) { | ||
1289 | len = strlen(table->procname); | ||
1290 | memcpy(path, table->procname, len); | ||
1291 | } | ||
1293 | if (len) { | 1292 | if (len) { |
1294 | path += len; | 1293 | path += len; |
1295 | if (table->child) { | 1294 | if (table->child) { |