diff options
-rw-r--r-- | drivers/net/wireless/hostap/hostap_info.c | 4 | ||||
-rw-r--r-- | drivers/net/wireless/hostap/hostap_main.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c index 47932b28aac1..970a48baaf80 100644 --- a/drivers/net/wireless/hostap/hostap_info.c +++ b/drivers/net/wireless/hostap/hostap_info.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
5 | #include <linux/slab.h> | 5 | #include <linux/slab.h> |
6 | #include <linux/export.h> | 6 | #include <linux/export.h> |
7 | #include <linux/etherdevice.h> | ||
7 | #include "hostap_wlan.h" | 8 | #include "hostap_wlan.h" |
8 | #include "hostap.h" | 9 | #include "hostap.h" |
9 | #include "hostap_ap.h" | 10 | #include "hostap_ap.h" |
@@ -463,8 +464,7 @@ static void handle_info_queue_scanresults(local_info_t *local) | |||
463 | prism2_host_roaming(local); | 464 | prism2_host_roaming(local); |
464 | 465 | ||
465 | if (local->host_roaming == 2 && local->iw_mode == IW_MODE_INFRA && | 466 | if (local->host_roaming == 2 && local->iw_mode == IW_MODE_INFRA && |
466 | memcmp(local->preferred_ap, "\x00\x00\x00\x00\x00\x00", | 467 | !is_zero_ether_addr(local->preferred_ap)) { |
467 | ETH_ALEN) != 0) { | ||
468 | /* | 468 | /* |
469 | * Firmware seems to be getting into odd state in host_roaming | 469 | * Firmware seems to be getting into odd state in host_roaming |
470 | * mode 2 when hostscan is used without join command, so try | 470 | * mode 2 when hostscan is used without join command, so try |
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c index 627bc12074c7..15f0fad39add 100644 --- a/drivers/net/wireless/hostap/hostap_main.c +++ b/drivers/net/wireless/hostap/hostap_main.c | |||
@@ -1084,7 +1084,7 @@ int prism2_sta_deauth(local_info_t *local, u16 reason) | |||
1084 | __le16 val = cpu_to_le16(reason); | 1084 | __le16 val = cpu_to_le16(reason); |
1085 | 1085 | ||
1086 | if (local->iw_mode != IW_MODE_INFRA || | 1086 | if (local->iw_mode != IW_MODE_INFRA || |
1087 | memcmp(local->bssid, "\x00\x00\x00\x00\x00\x00", ETH_ALEN) == 0 || | 1087 | is_zero_ether_addr(local->bssid) || |
1088 | memcmp(local->bssid, "\x44\x44\x44\x44\x44\x44", ETH_ALEN) == 0) | 1088 | memcmp(local->bssid, "\x44\x44\x44\x44\x44\x44", ETH_ALEN) == 0) |
1089 | return 0; | 1089 | return 0; |
1090 | 1090 | ||