aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-03-06 16:12:15 -0500
committerDavid S. Miller <davem@davemloft.net>2012-03-06 16:12:15 -0500
commit95f050bf7f64be5168ae2e2c715bb0b0ded141d1 (patch)
treec2e7eb3980c89de4b387b8fc2c6806b9c8b10438
parent66431a7d4570dbafb5e25c85607779ffa9c4a4bc (diff)
net: Use bool for return value of dev_valid_name().
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/netdevice.h2
-rw-r--r--net/core/dev.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 4d279c5287f..a89933bc4f2 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2122,7 +2122,7 @@ extern int netdev_rx_handler_register(struct net_device *dev,
2122 void *rx_handler_data); 2122 void *rx_handler_data);
2123extern void netdev_rx_handler_unregister(struct net_device *dev); 2123extern void netdev_rx_handler_unregister(struct net_device *dev);
2124 2124
2125extern int dev_valid_name(const char *name); 2125extern bool dev_valid_name(const char *name);
2126extern int dev_ioctl(struct net *net, unsigned int cmd, void __user *); 2126extern int dev_ioctl(struct net *net, unsigned int cmd, void __user *);
2127extern int dev_ethtool(struct net *net, struct ifreq *); 2127extern int dev_ethtool(struct net *net, struct ifreq *);
2128extern unsigned dev_get_flags(const struct net_device *); 2128extern unsigned dev_get_flags(const struct net_device *);
diff --git a/net/core/dev.c b/net/core/dev.c
index 5ef3b65c368..0090809af7b 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -848,21 +848,21 @@ EXPORT_SYMBOL(dev_get_by_flags_rcu);
848 * to allow sysfs to work. We also disallow any kind of 848 * to allow sysfs to work. We also disallow any kind of
849 * whitespace. 849 * whitespace.
850 */ 850 */
851int dev_valid_name(const char *name) 851bool dev_valid_name(const char *name)
852{ 852{
853 if (*name == '\0') 853 if (*name == '\0')
854 return 0; 854 return false;
855 if (strlen(name) >= IFNAMSIZ) 855 if (strlen(name) >= IFNAMSIZ)
856 return 0; 856 return false;
857 if (!strcmp(name, ".") || !strcmp(name, "..")) 857 if (!strcmp(name, ".") || !strcmp(name, ".."))
858 return 0; 858 return false;
859 859
860 while (*name) { 860 while (*name) {
861 if (*name == '/' || isspace(*name)) 861 if (*name == '/' || isspace(*name))
862 return 0; 862 return false;
863 name++; 863 name++;
864 } 864 }
865 return 1; 865 return true;
866} 866}
867EXPORT_SYMBOL(dev_valid_name); 867EXPORT_SYMBOL(dev_valid_name);
868 868