Commit 0c43e56c authored by Wei Yongjun's avatar Wei Yongjun Committed by Greg Kroah-Hartman

staging: rtl8192e: use is_broadcast_ether_addr() instead of memcmp()

Using is_broadcast_ether_addr() instead of directly use
memcmp() to determine if the ethernet address is broadcast
address.

spatch with a semantic match is used to found this problem.
(http://coccinelle.lip6.fr/)
Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 78b31143
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include <linux/random.h> #include <linux/random.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <linux/etherdevice.h>
#include "dot11d.h" #include "dot11d.h"
short rtllib_is_54g(struct rtllib_network *net) 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, ...@@ -1843,7 +1844,7 @@ static short probe_rq_parse(struct rtllib_device *ieee, struct sk_buff *skb,
bssid_match = bssid_match =
(memcmp(header->addr3, ieee->current_network.bssid, ETH_ALEN) != 0) && (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) if (bssid_match)
return -1; return -1;
...@@ -3361,9 +3362,7 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee, ...@@ -3361,9 +3362,7 @@ static int rtllib_wpa_set_encryption(struct rtllib_device *ieee,
param->u.crypt.key_len); param->u.crypt.key_len);
return -EINVAL; return -EINVAL;
} }
if (param->sta_addr[0] == 0xff && param->sta_addr[1] == 0xff && if (is_broadcast_ether_addr(param->sta_addr)) {
param->sta_addr[2] == 0xff && param->sta_addr[3] == 0xff &&
param->sta_addr[4] == 0xff && param->sta_addr[5] == 0xff) {
if (param->u.crypt.idx >= NUM_WEP_KEYS) if (param->u.crypt.idx >= NUM_WEP_KEYS)
return -EINVAL; return -EINVAL;
crypt = &ieee->crypt_info.crypt[param->u.crypt.idx]; crypt = &ieee->crypt_info.crypt[param->u.crypt.idx];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment