From b0764646353cd639fd2ec0529cbd34e847e10506 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 6 Mar 2012 16:12:15 -0500
Subject: [PATCH] --- yaml --- r: 290795 b: refs/heads/master c:
 95f050bf7f64be5168ae2e2c715bb0b0ded141d1 h: refs/heads/master i:   290793:
 ce6dcd31af7d34344d8639ce9321c0df4cffefe9   290791:
 b7ca7ecc0fadc557636628d0cd0fa395d340345b v: v3

---
 [refs]                          |  2 +-
 trunk/include/linux/netdevice.h |  2 +-
 trunk/net/core/dev.c            | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e750e40aa69a..098d905482b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66431a7d4570dbafb5e25c85607779ffa9c4a4bc
+refs/heads/master: 95f050bf7f64be5168ae2e2c715bb0b0ded141d1
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index 4d279c5287f8..a89933bc4f2f 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -2122,7 +2122,7 @@ extern int netdev_rx_handler_register(struct net_device *dev,
 				      void *rx_handler_data);
 extern void netdev_rx_handler_unregister(struct net_device *dev);
 
-extern int		dev_valid_name(const char *name);
+extern bool		dev_valid_name(const char *name);
 extern int		dev_ioctl(struct net *net, unsigned int cmd, void __user *);
 extern int		dev_ethtool(struct net *net, struct ifreq *);
 extern unsigned		dev_get_flags(const struct net_device *);
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 5ef3b65c3687..0090809af7bd 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -848,21 +848,21 @@ EXPORT_SYMBOL(dev_get_by_flags_rcu);
  *	to allow sysfs to work.  We also disallow any kind of
  *	whitespace.
  */
-int dev_valid_name(const char *name)
+bool dev_valid_name(const char *name)
 {
 	if (*name == '\0')
-		return 0;
+		return false;
 	if (strlen(name) >= IFNAMSIZ)
-		return 0;
+		return false;
 	if (!strcmp(name, ".") || !strcmp(name, ".."))
-		return 0;
+		return false;
 
 	while (*name) {
 		if (*name == '/' || isspace(*name))
-			return 0;
+			return false;
 		name++;
 	}
-	return 1;
+	return true;
 }
 EXPORT_SYMBOL(dev_valid_name);