diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-03-27 04:46:03 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-03-27 04:46:03 -0400 |
| commit | 072e5a1cfabca7276744d24726e094d85721df5c (patch) | |
| tree | c7237fa143f72273aa8a8179f741c24b9072001c /net/core/dev.c | |
| parent | 294fe0f52a44c6f207211de0686c369a961b5533 (diff) | |
| parent | d525211f9d1be8b523ec7633f080f2116f5ea536 (diff) | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 8f9710c62e20..962ee9d71964 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -946,7 +946,7 @@ bool dev_valid_name(const char *name) | |||
| 946 | return false; | 946 | return false; |
| 947 | 947 | ||
| 948 | while (*name) { | 948 | while (*name) { |
| 949 | if (*name == '/' || isspace(*name)) | 949 | if (*name == '/' || *name == ':' || isspace(*name)) |
| 950 | return false; | 950 | return false; |
| 951 | name++; | 951 | name++; |
| 952 | } | 952 | } |
