diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/core.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c index 733b7ce7f0e2..210ce7cd94d8 100644 --- a/drivers/net/wireless/rtlwifi/core.c +++ b/drivers/net/wireless/rtlwifi/core.c | |||
@@ -115,7 +115,7 @@ static void rtl_op_stop(struct ieee80211_hw *hw) | |||
115 | mutex_lock(&rtlpriv->locks.conf_mutex); | 115 | mutex_lock(&rtlpriv->locks.conf_mutex); |
116 | 116 | ||
117 | mac->link_state = MAC80211_NOLINK; | 117 | mac->link_state = MAC80211_NOLINK; |
118 | memset(mac->bssid, 0, 6); | 118 | memset(mac->bssid, 0, ETH_ALEN); |
119 | mac->vendor = PEER_UNKNOWN; | 119 | mac->vendor = PEER_UNKNOWN; |
120 | 120 | ||
121 | /*reset sec info */ | 121 | /*reset sec info */ |
@@ -280,7 +280,7 @@ static void rtl_op_remove_interface(struct ieee80211_hw *hw, | |||
280 | mac->p2p = 0; | 280 | mac->p2p = 0; |
281 | mac->vif = NULL; | 281 | mac->vif = NULL; |
282 | mac->link_state = MAC80211_NOLINK; | 282 | mac->link_state = MAC80211_NOLINK; |
283 | memset(mac->bssid, 0, 6); | 283 | memset(mac->bssid, 0, ETH_ALEN); |
284 | mac->vendor = PEER_UNKNOWN; | 284 | mac->vendor = PEER_UNKNOWN; |
285 | mac->opmode = NL80211_IFTYPE_UNSPECIFIED; | 285 | mac->opmode = NL80211_IFTYPE_UNSPECIFIED; |
286 | rtlpriv->cfg->ops->set_network_type(hw, mac->opmode); | 286 | rtlpriv->cfg->ops->set_network_type(hw, mac->opmode); |
@@ -721,7 +721,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
721 | mac->link_state = MAC80211_LINKED; | 721 | mac->link_state = MAC80211_LINKED; |
722 | mac->cnt_after_linked = 0; | 722 | mac->cnt_after_linked = 0; |
723 | mac->assoc_id = bss_conf->aid; | 723 | mac->assoc_id = bss_conf->aid; |
724 | memcpy(mac->bssid, bss_conf->bssid, 6); | 724 | memcpy(mac->bssid, bss_conf->bssid, ETH_ALEN); |
725 | 725 | ||
726 | if (rtlpriv->cfg->ops->linked_set_reg) | 726 | if (rtlpriv->cfg->ops->linked_set_reg) |
727 | rtlpriv->cfg->ops->linked_set_reg(hw); | 727 | rtlpriv->cfg->ops->linked_set_reg(hw); |
@@ -750,7 +750,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
750 | if (ppsc->p2p_ps_info.p2p_ps_mode > P2P_PS_NONE) | 750 | if (ppsc->p2p_ps_info.p2p_ps_mode > P2P_PS_NONE) |
751 | rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE); | 751 | rtl_p2p_ps_cmd(hw, P2P_PS_DISABLE); |
752 | mac->link_state = MAC80211_NOLINK; | 752 | mac->link_state = MAC80211_NOLINK; |
753 | memset(mac->bssid, 0, 6); | 753 | memset(mac->bssid, 0, ETH_ALEN); |
754 | mac->vendor = PEER_UNKNOWN; | 754 | mac->vendor = PEER_UNKNOWN; |
755 | 755 | ||
756 | if (rtlpriv->dm.supp_phymode_switch) { | 756 | if (rtlpriv->dm.supp_phymode_switch) { |
@@ -826,7 +826,7 @@ static void rtl_op_bss_info_changed(struct ieee80211_hw *hw, | |||
826 | bss_conf->bssid); | 826 | bss_conf->bssid); |
827 | 827 | ||
828 | mac->vendor = PEER_UNKNOWN; | 828 | mac->vendor = PEER_UNKNOWN; |
829 | memcpy(mac->bssid, bss_conf->bssid, 6); | 829 | memcpy(mac->bssid, bss_conf->bssid, ETH_ALEN); |
830 | rtlpriv->cfg->ops->set_network_type(hw, vif->type); | 830 | rtlpriv->cfg->ops->set_network_type(hw, vif->type); |
831 | 831 | ||
832 | rcu_read_lock(); | 832 | rcu_read_lock(); |