rtl8723bs: os_dep: replace rtw_malloc and memset with rtw_zmalloc
PATCH 48/87 rtl8723bs: os_dep: replace rtw_malloc and memset with rtw_zmalloc
rtw_malloc + memset(0) -> rtw_zmalloc
Signed-off-by Fuqian Huang <[email protected]>
--- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 ++------ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 12 +++--------- 2 files changed, 5 insertions(+), 15 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +2 -6
@@ -1078,12 +1078,10 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,DBG_871X ("pairwise =%d\n" , pairwise); param_len =sizeof (struct ieee_param ) + params->key_len; - param =rtw_malloc (param_len); + param =rtw_zmalloc (param_len);if (param ==NULL )return -1 ; -memset (param,0 , param_len); - param->cmd =IEEE_CMD_SET_ENCRYPTION ;memset (param->sta_addr,0xff ,ETH_ALEN );
@@ -2167,15 +2165,13 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, { wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); - pwep =rtw_malloc (wep_total_len); + pwep =rtw_zmalloc (wep_total_len);if (pwep ==NULL ) {DBG_871X (" wpa_set_encryption: pwep allocate fail !!!\n" ); ret = -ENOMEM ; goto exit; } -memset (pwep,0 , wep_total_len); - pwep->KeyLength = wep_key_len; pwep->Length = wep_total_len;
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c +3 -9
@@ -478,14 +478,12 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,if (wep_key_len >0 ) { wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); - pwep =rtw_malloc (wep_total_len); + pwep =rtw_zmalloc (wep_total_len);if (pwep ==NULL ) {RT_TRACE (_module_rtl871x_ioctl_os_c, _drv_err_, (" wpa_set_encryption: pwep allocate fail !!!\n" )); goto exit; } -memset (pwep,0 , wep_total_len); - pwep->KeyLength = wep_key_len; pwep->Length = wep_total_len;
@@ -2144,12 +2142,10 @@ static int rtw_wx_set_enc_ext(struct net_device *dev,int ret =0 ; param_len =sizeof (struct ieee_param ) + pext->key_len; - param =rtw_malloc (param_len); + param =rtw_zmalloc (param_len);if (param ==NULL )return -1 ; -memset (param,0 , param_len); - param->cmd =IEEE_CMD_SET_ENCRYPTION ;memset (param->sta_addr,0xff ,ETH_ALEN );
@@ -3522,14 +3518,12 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,if (wep_key_len >0 ) { wep_key_len = wep_key_len <=5 ?5 :13 ; wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); - pwep =rtw_malloc (wep_total_len); + pwep =rtw_zmalloc (wep_total_len);if (pwep ==NULL ) {DBG_871X (" r871x_set_encryption: pwep allocate fail !!!\n" ); goto exit; } -memset (pwep,0 , wep_total_len); - pwep->KeyLength = wep_key_len; pwep->Length = wep_total_len;
Signature · 1 line
2.11.0
Quoted 2 lines · Fuqian Huang
rtw_malloc+ memset(0) ->rtw_zmalloc
I have a feeling that everything under os_dep folder should be replaced with native kernel APIs.
Quoted 2 lines
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 8 ++------ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 12 +++---------
Signature · 2 lines
With Best Regards, Andy Shevchenko