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/core/utils.c | |
parent | 06d61cbf7c2522f43c09d5bb050acd0bd31812c0 (diff) | |
parent | 691b73b13220886aefacb7c7f7ace7f528bbf800 (diff) | |
download | talos-op-linux-83cbd33aae2c3cd14f80a8abf733033a57aa4923.tar.gz talos-op-linux-83cbd33aae2c3cd14f80a8abf733033a57aa4923.zip |
Merge branch 'bonding-sysfs' of git://git.tuxdriver.com/git/netdev-jwl
Diffstat (limited to 'net/core/utils.c')
-rw-r--r-- | net/core/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/utils.c b/net/core/utils.c index 7b5970fc9e40..587eb7787deb 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'; |