aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2015-03-02 22:54:49 -0500
committerDavid S. Miller <davem@davemloft.net>2015-03-03 17:01:36 -0500
commit93803b3385c653bc6fd391c0de00ef811b3dadc0 (patch)
treee235b7e13f190356597758d2f498ce4e79d6d5a8 /drivers/net/wireless/p54
parent519983b129477cb8e0bbea334c72ecd4486b2d21 (diff)
wireless: Use eth_<foo>_addr instead of memset
Use the built-in function instead of memset. Miscellanea: Add #include <linux/etherdevice.h> where appropriate Use ETH_ALEN instead of 6 Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/p54')
-rw-r--r--drivers/net/wireless/p54/fwio.c2
-rw-r--r--drivers/net/wireless/p54/main.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c
index 5367d510b22d..275408eaf95e 100644
--- a/drivers/net/wireless/p54/fwio.c
+++ b/drivers/net/wireless/p54/fwio.c
@@ -671,7 +671,7 @@ int p54_upload_key(struct p54_common *priv, u8 algo, int slot, u8 idx, u8 len,
671 if (addr) 671 if (addr)
672 memcpy(rxkey->mac, addr, ETH_ALEN); 672 memcpy(rxkey->mac, addr, ETH_ALEN);
673 else 673 else
674 memset(rxkey->mac, ~0, ETH_ALEN); 674 eth_broadcast_addr(rxkey->mac);
675 675
676 switch (algo) { 676 switch (algo) {
677 case P54_CRYPTO_WEP: 677 case P54_CRYPTO_WEP:
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c
index b9250d75d253..e79674f73dc5 100644
--- a/drivers/net/wireless/p54/main.c
+++ b/drivers/net/wireless/p54/main.c
@@ -182,7 +182,7 @@ static int p54_start(struct ieee80211_hw *dev)
182 if (err) 182 if (err)
183 goto out; 183 goto out;
184 184
185 memset(priv->bssid, ~0, ETH_ALEN); 185 eth_broadcast_addr(priv->bssid);
186 priv->mode = NL80211_IFTYPE_MONITOR; 186 priv->mode = NL80211_IFTYPE_MONITOR;
187 err = p54_setup_mac(priv); 187 err = p54_setup_mac(priv);
188 if (err) { 188 if (err) {
@@ -274,8 +274,8 @@ static void p54_remove_interface(struct ieee80211_hw *dev,
274 wait_for_completion_interruptible_timeout(&priv->beacon_comp, HZ); 274 wait_for_completion_interruptible_timeout(&priv->beacon_comp, HZ);
275 } 275 }
276 priv->mode = NL80211_IFTYPE_MONITOR; 276 priv->mode = NL80211_IFTYPE_MONITOR;
277 memset(priv->mac_addr, 0, ETH_ALEN); 277 eth_zero_addr(priv->mac_addr);
278 memset(priv->bssid, 0, ETH_ALEN); 278 eth_zero_addr(priv->bssid);
279 p54_setup_mac(priv); 279 p54_setup_mac(priv);
280 mutex_unlock(&priv->conf_mutex); 280 mutex_unlock(&priv->conf_mutex);
281} 281}
@@ -794,7 +794,7 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
794 init_completion(&priv->beacon_comp); 794 init_completion(&priv->beacon_comp);
795 INIT_DELAYED_WORK(&priv->work, p54_work); 795 INIT_DELAYED_WORK(&priv->work, p54_work);
796 796
797 memset(&priv->mc_maclist[0], ~0, ETH_ALEN); 797 eth_broadcast_addr(priv->mc_maclist[0]);
798 priv->curchan = NULL; 798 priv->curchan = NULL;
799 p54_reset_stats(priv); 799 p54_reset_stats(priv);
800 return dev; 800 return dev;