diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-06-13 13:33:39 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-06-13 13:33:39 -0400 |
commit | 3100cdd8bf813bcf66aa60afcaede7d92e11fab3 (patch) | |
tree | 437dc61d3bddb1ffa36f7882af05a0dbb50a1588 /drivers/net/wireless/ath/ath6kl/debug.c | |
parent | fca97d763dc662db446c9a6e5486ef0c77d8ad5b (diff) | |
parent | 37291fc61253cd34db40b7a60be4497db776db41 (diff) |
Merge branch 'for-linville' of git://github.com/kvalo/ath6kl
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/debug.c')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/debug.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c index fe38b836cb2..dbfd17d0a5f 100644 --- a/drivers/net/wireless/ath/ath6kl/debug.c +++ b/drivers/net/wireless/ath/ath6kl/debug.c @@ -1240,20 +1240,14 @@ static ssize_t ath6kl_force_roam_write(struct file *file, char buf[20]; size_t len; u8 bssid[ETH_ALEN]; - int i; - int addr[ETH_ALEN]; len = min(count, sizeof(buf) - 1); if (copy_from_user(buf, user_buf, len)) return -EFAULT; buf[len] = '\0'; - if (sscanf(buf, "%02x:%02x:%02x:%02x:%02x:%02x", - &addr[0], &addr[1], &addr[2], &addr[3], &addr[4], &addr[5]) - != ETH_ALEN) + if (!mac_pton(buf, bssid)) return -EINVAL; - for (i = 0; i < ETH_ALEN; i++) - bssid[i] = addr[i]; ret = ath6kl_wmi_force_roam_cmd(ar->wmi, bssid); if (ret) |