diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:49:03 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:49:03 -0500 |
| commit | 83cbd33aae2c3cd14f80a8abf733033a57aa4923 (patch) | |
| tree | de05bf460a181d5ff68257418021e10fa262da93 /net | |
| parent | 06d61cbf7c2522f43c09d5bb050acd0bd31812c0 (diff) | |
| parent | 691b73b13220886aefacb7c7f7ace7f528bbf800 (diff) | |
| download | kernel-crypto-83cbd33aae2c3cd14f80a8abf733033a57aa4923.tar.gz kernel-crypto-83cbd33aae2c3cd14f80a8abf733033a57aa4923.tar.xz kernel-crypto-83cbd33aae2c3cd14f80a8abf733033a57aa4923.zip | |
Merge branch 'bonding-sysfs' of git://git.tuxdriver.com/git/netdev-jwl
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 3 | ||||
| -rw-r--r-- | net/core/utils.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 0b48e294aaf..94e642ee6e2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -626,7 +626,7 @@ struct net_device * dev_get_by_flags(unsigned short if_flags, unsigned short mas * Network device names need to be valid file names to * to allow sysfs to work */ -static int dev_valid_name(const char *name) +int dev_valid_name(const char *name) { return !(*name == '\0' || !strcmp(name, ".") @@ -3269,6 +3269,7 @@ EXPORT_SYMBOL(__dev_get_by_index); EXPORT_SYMBOL(__dev_get_by_name); EXPORT_SYMBOL(__dev_remove_pack); EXPORT_SYMBOL(__skb_linearize); +EXPORT_SYMBOL(dev_valid_name); EXPORT_SYMBOL(dev_add_pack); EXPORT_SYMBOL(dev_alloc_name); EXPORT_SYMBOL(dev_close); diff --git a/net/core/utils.c b/net/core/utils.c index 7b5970fc9e4..587eb7787de 100644 --- a/net/core/utils.c +++ b/net/core/utils.c @@ -175,7 +175,7 @@ __u32 in_aton(const char *str) if (*str != '\0') { val = 0; - while (*str != '\0' && *str != '.') + while (*str != '\0' && *str != '.' && *str != '\n') { val *= 10; val += *str - '0'; |