aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2012-10-22 16:55:38 -0400
committerJohn W. Linville <linville@tuxdriver.com>2012-10-29 15:28:54 -0400
commitba40d16696c86165744c89e0dae649df78dd82f4 (patch)
treeeee772b46b88bd160775d23bf0803e20d4ddd06c
parentce81e3175ed5b86b19ef068246fc2c829aff84d5 (diff)
brcmfmac: use memset when setting a broadcast mac address
The driver had a global constant ether_bcast, which was copied whenever a broadcast mac address was needed. This patch does a memset(dest, 0xFF, ETH_ALEN) instead and consequently removes the global ether_bcast. Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: Franky Lin <frankyl@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 5ce0068c097..94c619ab20f 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -94,8 +94,6 @@
94#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \ 94#define BRCMF_ASSOC_PARAMS_FIXED_SIZE \
95 (sizeof(struct brcmf_assoc_params_le) - sizeof(u16)) 95 (sizeof(struct brcmf_assoc_params_le) - sizeof(u16))
96 96
97static const u8 ether_bcast[ETH_ALEN] = {255, 255, 255, 255, 255, 255};
98
99static u32 brcmf_dbg_level = WL_DBG_ERR; 97static u32 brcmf_dbg_level = WL_DBG_ERR;
100 98
101static bool check_vif_up(struct brcmf_cfg80211_vif *vif) 99static bool check_vif_up(struct brcmf_cfg80211_vif *vif)
@@ -534,7 +532,7 @@ static void brcmf_set_mpc(struct net_device *ndev, int mpc)
534static void brcmf_iscan_prep(struct brcmf_scan_params_le *params_le, 532static void brcmf_iscan_prep(struct brcmf_scan_params_le *params_le,
535 struct brcmf_ssid *ssid) 533 struct brcmf_ssid *ssid)
536{ 534{
537 memcpy(params_le->bssid, ether_bcast, ETH_ALEN); 535 memset(params_le->bssid, 0xFF, ETH_ALEN);
538 params_le->bss_type = DOT11_BSSTYPE_ANY; 536 params_le->bss_type = DOT11_BSSTYPE_ANY;
539 params_le->scan_type = 0; 537 params_le->scan_type = 0;
540 params_le->channel_num = 0; 538 params_le->channel_num = 0;
@@ -721,7 +719,7 @@ static void brcmf_escan_prep(struct brcmf_scan_params_le *params_le,
721 char *ptr; 719 char *ptr;
722 struct brcmf_ssid_le ssid_le; 720 struct brcmf_ssid_le ssid_le;
723 721
724 memcpy(params_le->bssid, ether_bcast, ETH_ALEN); 722 memset(params_le->bssid, 0xFF, ETH_ALEN);
725 params_le->bss_type = DOT11_BSSTYPE_ANY; 723 params_le->bss_type = DOT11_BSSTYPE_ANY;
726 params_le->scan_type = 0; 724 params_le->scan_type = 0;
727 params_le->channel_num = 0; 725 params_le->channel_num = 0;
@@ -810,7 +808,7 @@ brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
810 /* Do a scan abort to stop the driver's scan engine */ 808 /* Do a scan abort to stop the driver's scan engine */
811 WL_SCAN("ABORT scan in firmware\n"); 809 WL_SCAN("ABORT scan in firmware\n");
812 memset(&params_le, 0, sizeof(params_le)); 810 memset(&params_le, 0, sizeof(params_le));
813 memcpy(params_le.bssid, ether_bcast, ETH_ALEN); 811 memset(params_le.bssid, 0xFF, ETH_ALEN);
814 params_le.bss_type = DOT11_BSSTYPE_ANY; 812 params_le.bss_type = DOT11_BSSTYPE_ANY;
815 params_le.scan_type = 0; 813 params_le.scan_type = 0;
816 params_le.channel_num = cpu_to_le32(1); 814 params_le.channel_num = cpu_to_le32(1);
@@ -1283,7 +1281,7 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
1283 BRCMF_ASSOC_PARAMS_FIXED_SIZE; 1281 BRCMF_ASSOC_PARAMS_FIXED_SIZE;
1284 memcpy(profile->bssid, params->bssid, ETH_ALEN); 1282 memcpy(profile->bssid, params->bssid, ETH_ALEN);
1285 } else { 1283 } else {
1286 memcpy(join_params.params_le.bssid, ether_bcast, ETH_ALEN); 1284 memset(join_params.params_le.bssid, 0xFF, ETH_ALEN);
1287 memset(profile->bssid, 0, ETH_ALEN); 1285 memset(profile->bssid, 0, ETH_ALEN);
1288 } 1286 }
1289 1287
@@ -1673,7 +1671,7 @@ brcmf_cfg80211_connect(struct wiphy *wiphy, struct net_device *ndev,
1673 memcpy(&profile->ssid.SSID, sme->ssid, profile->ssid.SSID_len); 1671 memcpy(&profile->ssid.SSID, sme->ssid, profile->ssid.SSID_len);
1674 join_params.ssid_le.SSID_len = cpu_to_le32(profile->ssid.SSID_len); 1672 join_params.ssid_le.SSID_len = cpu_to_le32(profile->ssid.SSID_len);
1675 1673
1676 memcpy(join_params.params_le.bssid, ether_bcast, ETH_ALEN); 1674 memset(join_params.params_le.bssid, 0xFF, ETH_ALEN);
1677 1675
1678 if (ssid.SSID_len < IEEE80211_MAX_SSID_LEN) 1676 if (ssid.SSID_len < IEEE80211_MAX_SSID_LEN)
1679 WL_CONN("ssid \"%s\", len (%d)\n", 1677 WL_CONN("ssid \"%s\", len (%d)\n",