diff options
author | Joe Perches <joe@perches.com> | 2015-03-02 22:54:57 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-03-03 17:01:38 -0500 |
commit | c84a67a2fc70841e642fe2f0429abb1d9b4d2167 (patch) | |
tree | 04f3c5240192fa2612c430f533a92b8a903c459b | |
parent | afc130dd3902942c3cae55512b120b7e1df29239 (diff) |
mac80211: Use eth_<foo>_addr instead of memset
Use the built-in function instead of memset.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/mac80211/cfg.c | 2 | ||||
-rw-r--r-- | net/mac80211/ibss.c | 2 | ||||
-rw-r--r-- | net/mac80211/mesh.c | 2 | ||||
-rw-r--r-- | net/mac80211/mlme.c | 10 |
4 files changed, 8 insertions, 8 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index dd4ff36c557a..74f509c500f2 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c | |||
@@ -1488,7 +1488,7 @@ static void mpath_set_pinfo(struct mesh_path *mpath, u8 *next_hop, | |||
1488 | if (next_hop_sta) | 1488 | if (next_hop_sta) |
1489 | memcpy(next_hop, next_hop_sta->sta.addr, ETH_ALEN); | 1489 | memcpy(next_hop, next_hop_sta->sta.addr, ETH_ALEN); |
1490 | else | 1490 | else |
1491 | memset(next_hop, 0, ETH_ALEN); | 1491 | eth_zero_addr(next_hop); |
1492 | 1492 | ||
1493 | memset(pinfo, 0, sizeof(*pinfo)); | 1493 | memset(pinfo, 0, sizeof(*pinfo)); |
1494 | 1494 | ||
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index b606b53a49a7..f9b07588baf5 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c | |||
@@ -1742,7 +1742,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) | |||
1742 | 1742 | ||
1743 | ieee80211_ibss_disconnect(sdata); | 1743 | ieee80211_ibss_disconnect(sdata); |
1744 | ifibss->ssid_len = 0; | 1744 | ifibss->ssid_len = 0; |
1745 | memset(ifibss->bssid, 0, ETH_ALEN); | 1745 | eth_zero_addr(ifibss->bssid); |
1746 | 1746 | ||
1747 | /* remove beacon */ | 1747 | /* remove beacon */ |
1748 | kfree(sdata->u.ibss.ie); | 1748 | kfree(sdata->u.ibss.ie); |
diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index 0c8b2a77d312..49a44bcd8aba 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c | |||
@@ -520,7 +520,7 @@ int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc, | |||
520 | } else { | 520 | } else { |
521 | *fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS); | 521 | *fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS); |
522 | /* RA TA DA SA */ | 522 | /* RA TA DA SA */ |
523 | memset(hdr->addr1, 0, ETH_ALEN); /* RA is resolved later */ | 523 | eth_zero_addr(hdr->addr1); /* RA is resolved later */ |
524 | memcpy(hdr->addr2, meshsa, ETH_ALEN); | 524 | memcpy(hdr->addr2, meshsa, ETH_ALEN); |
525 | memcpy(hdr->addr3, meshda, ETH_ALEN); | 525 | memcpy(hdr->addr3, meshda, ETH_ALEN); |
526 | memcpy(hdr->addr4, meshsa, ETH_ALEN); | 526 | memcpy(hdr->addr4, meshsa, ETH_ALEN); |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 10ac6324c1d0..9f6f3562396a 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -2033,7 +2033,7 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, | |||
2033 | ieee80211_flush_queues(local, sdata, false); | 2033 | ieee80211_flush_queues(local, sdata, false); |
2034 | 2034 | ||
2035 | /* clear bssid only after building the needed mgmt frames */ | 2035 | /* clear bssid only after building the needed mgmt frames */ |
2036 | memset(ifmgd->bssid, 0, ETH_ALEN); | 2036 | eth_zero_addr(ifmgd->bssid); |
2037 | 2037 | ||
2038 | /* remove AP and TDLS peers */ | 2038 | /* remove AP and TDLS peers */ |
2039 | sta_info_flush(sdata); | 2039 | sta_info_flush(sdata); |
@@ -2464,7 +2464,7 @@ static void ieee80211_destroy_auth_data(struct ieee80211_sub_if_data *sdata, | |||
2464 | del_timer_sync(&sdata->u.mgd.timer); | 2464 | del_timer_sync(&sdata->u.mgd.timer); |
2465 | sta_info_destroy_addr(sdata, auth_data->bss->bssid); | 2465 | sta_info_destroy_addr(sdata, auth_data->bss->bssid); |
2466 | 2466 | ||
2467 | memset(sdata->u.mgd.bssid, 0, ETH_ALEN); | 2467 | eth_zero_addr(sdata->u.mgd.bssid); |
2468 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); | 2468 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); |
2469 | sdata->u.mgd.flags = 0; | 2469 | sdata->u.mgd.flags = 0; |
2470 | mutex_lock(&sdata->local->mtx); | 2470 | mutex_lock(&sdata->local->mtx); |
@@ -2777,7 +2777,7 @@ static void ieee80211_destroy_assoc_data(struct ieee80211_sub_if_data *sdata, | |||
2777 | del_timer_sync(&sdata->u.mgd.timer); | 2777 | del_timer_sync(&sdata->u.mgd.timer); |
2778 | sta_info_destroy_addr(sdata, assoc_data->bss->bssid); | 2778 | sta_info_destroy_addr(sdata, assoc_data->bss->bssid); |
2779 | 2779 | ||
2780 | memset(sdata->u.mgd.bssid, 0, ETH_ALEN); | 2780 | eth_zero_addr(sdata->u.mgd.bssid); |
2781 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); | 2781 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); |
2782 | sdata->u.mgd.flags = 0; | 2782 | sdata->u.mgd.flags = 0; |
2783 | mutex_lock(&sdata->local->mtx); | 2783 | mutex_lock(&sdata->local->mtx); |
@@ -4474,7 +4474,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, | |||
4474 | return 0; | 4474 | return 0; |
4475 | 4475 | ||
4476 | err_clear: | 4476 | err_clear: |
4477 | memset(ifmgd->bssid, 0, ETH_ALEN); | 4477 | eth_zero_addr(ifmgd->bssid); |
4478 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); | 4478 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); |
4479 | ifmgd->auth_data = NULL; | 4479 | ifmgd->auth_data = NULL; |
4480 | err_free: | 4480 | err_free: |
@@ -4817,7 +4817,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata, | |||
4817 | 4817 | ||
4818 | return 0; | 4818 | return 0; |
4819 | err_clear: | 4819 | err_clear: |
4820 | memset(ifmgd->bssid, 0, ETH_ALEN); | 4820 | eth_zero_addr(ifmgd->bssid); |
4821 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); | 4821 | ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BSSID); |
4822 | ifmgd->assoc_data = NULL; | 4822 | ifmgd->assoc_data = NULL; |
4823 | err_free: | 4823 | err_free: |