|
@@ -3,24 +3,24 @@
|
|
#include <linux/ctype.h>
|
|
#include <linux/ctype.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/kernel.h>
|
|
|
|
|
|
-int mac_pton(const char *s, u8 *mac)
|
|
|
|
|
|
+bool mac_pton(const char *s, u8 *mac)
|
|
{
|
|
{
|
|
int i;
|
|
int i;
|
|
|
|
|
|
/* XX:XX:XX:XX:XX:XX */
|
|
/* XX:XX:XX:XX:XX:XX */
|
|
if (strlen(s) < 3 * ETH_ALEN - 1)
|
|
if (strlen(s) < 3 * ETH_ALEN - 1)
|
|
- return 0;
|
|
|
|
|
|
+ return false;
|
|
|
|
|
|
/* Don't dirty result unless string is valid MAC. */
|
|
/* Don't dirty result unless string is valid MAC. */
|
|
for (i = 0; i < ETH_ALEN; i++) {
|
|
for (i = 0; i < ETH_ALEN; i++) {
|
|
if (!isxdigit(s[i * 3]) || !isxdigit(s[i * 3 + 1]))
|
|
if (!isxdigit(s[i * 3]) || !isxdigit(s[i * 3 + 1]))
|
|
- return 0;
|
|
|
|
|
|
+ return false;
|
|
if (i != ETH_ALEN - 1 && s[i * 3 + 2] != ':')
|
|
if (i != ETH_ALEN - 1 && s[i * 3 + 2] != ':')
|
|
- return 0;
|
|
|
|
|
|
+ return false;
|
|
}
|
|
}
|
|
for (i = 0; i < ETH_ALEN; i++) {
|
|
for (i = 0; i < ETH_ALEN; i++) {
|
|
mac[i] = (hex_to_bin(s[i * 3]) << 4) | hex_to_bin(s[i * 3 + 1]);
|
|
mac[i] = (hex_to_bin(s[i * 3]) << 4) | hex_to_bin(s[i * 3 + 1]);
|
|
}
|
|
}
|
|
- return 1;
|
|
|
|
|
|
+ return true;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(mac_pton);
|
|
EXPORT_SYMBOL(mac_pton);
|