diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-11-05 23:24:38 +0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-11-07 21:01:07 +0400 |
| commit | 28656a111af70116027fb0a0931df4b46d7375b1 (patch) | |
| tree | 8990c91598413f68d8885f11a3a48757433ece40 /net/mac80211 | |
| parent | b84e7a05f619faec58bff24dfeeb2406f8dab584 (diff) | |
| download | linux-28656a111af70116027fb0a0931df4b46d7375b1.tar.xz | |
mac80211: use mac_pton
Instead of implementing practically the same
function (hwaddr_aton) use mac_pton.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/debugfs_netdev.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index 07c5721323ca..4b68ec770bdd 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c @@ -10,6 +10,7 @@ #include <linux/kernel.h> #include <linux/device.h> #include <linux/if.h> +#include <linux/if_ether.h> #include <linux/interrupt.h> #include <linux/netdevice.h> #include <linux/rtnetlink.h> @@ -248,27 +249,6 @@ static ssize_t ieee80211_if_fmt_tkip_mic_test( return -EOPNOTSUPP; } -static int hwaddr_aton(const char *txt, u8 *addr) -{ - int i; - - for (i = 0; i < ETH_ALEN; i++) { - int a, b; - - a = hex_to_bin(*txt++); - if (a < 0) - return -1; - b = hex_to_bin(*txt++); - if (b < 0) - return -1; - *addr++ = (a << 4) | b; - if (i < 5 && *txt++ != ':') - return -1; - } - - return 0; -} - static ssize_t ieee80211_if_parse_tkip_mic_test( struct ieee80211_sub_if_data *sdata, const char *buf, int buflen) { @@ -278,13 +258,7 @@ static ssize_t ieee80211_if_parse_tkip_mic_test( struct ieee80211_hdr *hdr; __le16 fc; - /* - * Assume colon-delimited MAC address with possible white space - * following. - */ - if (buflen < 3 * ETH_ALEN - 1) - return -EINVAL; - if (hwaddr_aton(buf, addr) < 0) + if (!mac_pton(buf, addr)) return -EINVAL; if (!ieee80211_sdata_running(sdata)) |