aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi/core.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rtlwifi/core.c')
-rw-r--r--drivers/net/wireless/rtlwifi/core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index a7c0e52869ba..be33aa14c8af 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -962,7 +962,6 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
962 int err = 0; 962 int err = 0;
963 u8 mac_addr[ETH_ALEN]; 963 u8 mac_addr[ETH_ALEN];
964 u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; 964 u8 bcast_addr[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
965 u8 zero_addr[ETH_ALEN] = { 0 };
966 965
967 if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) { 966 if (rtlpriv->cfg->mod_params->sw_crypto || rtlpriv->sec.use_sw_sec) {
968 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING, 967 RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
@@ -1057,7 +1056,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
1057 memcpy(rtlpriv->sec.key_buf[key_idx], 1056 memcpy(rtlpriv->sec.key_buf[key_idx],
1058 key->key, key->keylen); 1057 key->key, key->keylen);
1059 rtlpriv->sec.key_len[key_idx] = key->keylen; 1058 rtlpriv->sec.key_len[key_idx] = key->keylen;
1060 memcpy(mac_addr, zero_addr, ETH_ALEN); 1059 eth_zero_addr(mac_addr);
1061 } else if (group_key) { /* group key */ 1060 } else if (group_key) { /* group key */
1062 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG, 1061 RT_TRACE(rtlpriv, COMP_SEC, DBG_DMESG,
1063 "set group key\n"); 1062 "set group key\n");
@@ -1108,7 +1107,7 @@ static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
1108 } 1107 }
1109 memset(rtlpriv->sec.key_buf[key_idx], 0, key->keylen); 1108 memset(rtlpriv->sec.key_buf[key_idx], 0, key->keylen);
1110 rtlpriv->sec.key_len[key_idx] = 0; 1109 rtlpriv->sec.key_len[key_idx] = 0;
1111 memcpy(mac_addr, zero_addr, ETH_ALEN); 1110 eth_zero_addr(mac_addr);
1112 /* 1111 /*
1113 *mac80211 will delete entrys one by one, 1112 *mac80211 will delete entrys one by one,
1114 *so don't use rtl_cam_reset_all_entry 1113 *so don't use rtl_cam_reset_all_entry