Commit 0fb33213 authored by Cyril Roelandt's avatar Cyril Roelandt Committed by Greg Kroah-Hartman

rtl8712: remove useless calls to memset().

These calls are followed by calls to memcpy() on the same memory area, so they
can be safely removed.
Signed-off-by: default avatarCyril Roelandt <tipecaml@gmail.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 17cb3be6
...@@ -106,8 +106,6 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter) ...@@ -106,8 +106,6 @@ void r8712_os_indicate_disconnect(struct _adapter *adapter)
* disconnect with AP for 60 seconds. * disconnect with AP for 60 seconds.
*/ */
memset(&backupPMKIDList[0], 0x00, sizeof(
struct RT_PMKID_LIST) * NUM_PMKID_CACHE);
memcpy(&backupPMKIDList[0], &adapter->securitypriv. memcpy(&backupPMKIDList[0], &adapter->securitypriv.
PMKIDList[0], sizeof(struct RT_PMKID_LIST) * PMKIDList[0], sizeof(struct RT_PMKID_LIST) *
NUM_PMKID_CACHE); NUM_PMKID_CACHE);
......
...@@ -525,7 +525,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) ...@@ -525,7 +525,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd); kfree(pcmd);
return _FAIL; return _FAIL;
} }
memset(psecnetwork, 0, t_len);
memcpy(psecnetwork, &pnetwork->network, t_len); memcpy(psecnetwork, &pnetwork->network, t_len);
auth = &psecuritypriv->authenticator_ie[0]; auth = &psecuritypriv->authenticator_ie[0];
psecuritypriv->authenticator_ie[0] = (unsigned char) psecuritypriv->authenticator_ie[0] = (unsigned char)
......
...@@ -97,8 +97,6 @@ static u8 do_join(struct _adapter *padapter) ...@@ -97,8 +97,6 @@ static u8 do_join(struct _adapter *padapter)
pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE; pmlmepriv->fw_state = WIFI_ADHOC_MASTER_STATE;
pibss = padapter->registrypriv.dev_network. pibss = padapter->registrypriv.dev_network.
MacAddress; MacAddress;
memset(&pdev_network->Ssid, 0,
sizeof(struct ndis_802_11_ssid));
memcpy(&pdev_network->Ssid, memcpy(&pdev_network->Ssid,
&pmlmepriv->assoc_ssid, &pmlmepriv->assoc_ssid,
sizeof(struct ndis_802_11_ssid)); sizeof(struct ndis_802_11_ssid));
......
...@@ -604,9 +604,6 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf) ...@@ -604,9 +604,6 @@ void r8712_surveydone_event_callback(struct _adapter *adapter, u8 *pbuf)
adapter->registrypriv. adapter->registrypriv.
dev_network.MacAddress; dev_network.MacAddress;
pmlmepriv->fw_state ^= _FW_UNDER_SURVEY; pmlmepriv->fw_state ^= _FW_UNDER_SURVEY;
memset(&pdev_network->Ssid, 0,
sizeof(struct
ndis_802_11_ssid));
memcpy(&pdev_network->Ssid, memcpy(&pdev_network->Ssid,
&pmlmepriv->assoc_ssid, &pmlmepriv->assoc_ssid,
sizeof(struct sizeof(struct
...@@ -1006,8 +1003,6 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf) ...@@ -1006,8 +1003,6 @@ void r8712_stadel_event_callback(struct _adapter *adapter, u8 *pbuf)
memcpy(pdev_network, &tgt_network->network, memcpy(pdev_network, &tgt_network->network,
r8712_get_ndis_wlan_bssid_ex_sz(&tgt_network-> r8712_get_ndis_wlan_bssid_ex_sz(&tgt_network->
network)); network));
memset(&pdev_network->Ssid, 0,
sizeof(struct ndis_802_11_ssid));
memcpy(&pdev_network->Ssid, memcpy(&pdev_network->Ssid,
&pmlmepriv->assoc_ssid, &pmlmepriv->assoc_ssid,
sizeof(struct ndis_802_11_ssid)); sizeof(struct ndis_802_11_ssid));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment