|
@@ -19,6 +19,7 @@
|
|
|
#include <linux/random.h>
|
|
|
#include <linux/delay.h>
|
|
|
#include <linux/uaccess.h>
|
|
|
+#include <linux/etherdevice.h>
|
|
|
#include "dot11d.h"
|
|
|
|
|
|
short rtllib_is_54g(struct rtllib_network *net)
|
|
@@ -1843,7 +1844,7 @@ static short probe_rq_parse(struct rtllib_device *ieee, struct sk_buff *skb,
|
|
|
|
|
|
bssid_match =
|
|
|
(memcmp(header->addr3, ieee->current_network.bssid, ETH_ALEN) != 0) &&
|
|
|
- (memcmp(header->addr3, "\xff\xff\xff\xff\xff\xff", ETH_ALEN) != 0);
|
|
|
+ (!is_broadcast_ether_addr(header->addr3));
|
|
|
if (bssid_match)
|
|
|
return -1;
|
|
|
|
|
@@ -3361,9 +3362,7 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
|
|
|
param->u.crypt.key_len);
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
- if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff &&
|
|
|
- param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
|
|
|
- param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
|
|
|
+ if (is_broadcast_ether_addr(param->sta_addr)) {
|
|
|
if (param->u.crypt.idx >= NUM_WEP_KEYS)
|
|
|
return -EINVAL;
|
|
|
crypt = &ieee->crypt_info.crypt[param->u.crypt.idx];
|