diff options
| author | Rob Herring <robh@kernel.org> | 2015-03-10 10:03:04 -0400 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-03-10 10:03:04 -0400 |
| commit | 2c192699a7050ef5bdf1e2cc95fdddfbcf524509 (patch) | |
| tree | 945d4553691ecb24151a2fa83b7d489665dd3248 /net/core/dev.c | |
| parent | 25e8f336e535d10c30216e1ba330fbea98dfccc5 (diff) | |
| parent | 9eccca0843205f87c00404b663188b88eb248051 (diff) | |
Merge tag 'v4.0-rc3' into HEAD
Linux 4.0-rc3
Merging in v4.0-rc3 because commit 30a22c215a00 (console: Fix
console name size mismatch) is a dependency.
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 | } |