diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-18 07:58:33 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-09-18 07:58:33 -0700 |
| commit | 4ba25a496f62129a2ad8c2436ab2b402752dc66c (patch) | |
| tree | 8abf41a79f293832a430a9609530c24cd365466c /net/core/utils.c | |
| parent | Input: rb532_button - remove redundant dev_set_drvdata (diff) | |
| parent | Linux 3.11 (diff) | |
| download | linux-dev-4ba25a496f62129a2ad8c2436ab2b402752dc66c.tar.xz linux-dev-4ba25a496f62129a2ad8c2436ab2b402752dc66c.zip | |
Merge tag 'v3.11' into next
Merge with mainline to bring in sync changes to cyttsp4 driver.
Diffstat (limited to 'net/core/utils.c')
| -rw-r--r-- | net/core/utils.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/net/core/utils.c b/net/core/utils.c index 3c7f5b51b979..aa88e23fc87a 100644 --- a/net/core/utils.c +++ b/net/core/utils.c @@ -338,25 +338,3 @@ void inet_proto_csum_replace16(__sum16 *sum, struct sk_buff *skb, csum_unfold(*sum))); } EXPORT_SYMBOL(inet_proto_csum_replace16); - -int mac_pton(const char *s, u8 *mac) -{ - int i; - - /* XX:XX:XX:XX:XX:XX */ - if (strlen(s) < 3 * ETH_ALEN - 1) - return 0; - - /* Don't dirty result unless string is valid MAC. */ - for (i = 0; i < ETH_ALEN; i++) { - if (!isxdigit(s[i * 3]) || !isxdigit(s[i * 3 + 1])) - return 0; - if (i != ETH_ALEN - 1 && s[i * 3 + 2] != ':') - return 0; - } - for (i = 0; i < ETH_ALEN; i++) { - mac[i] = (hex_to_bin(s[i * 3]) << 4) | hex_to_bin(s[i * 3 + 1]); - } - return 1; -} -EXPORT_SYMBOL(mac_pton); |