Commit ac663ae2 authored by Nam Cao's avatar Nam Cao Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: replace FIELD_OFFSET with offsetof 



This driver defines FIELD_OFFSET which does the same as offsetof.
Replace this macro with offsetof.

Signed-off-by: default avatarNam Cao <namcaov@gmail.com>
Link: https://lore.kernel.org/r/9443ef83f565eafe1e4f348412772d4ab966093a.1654994517.git.namcaov@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 35ba63b8

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+2 −2
Original line number Diff line number Diff line
@@ -7110,7 +7110,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) 
		/* clear CAM */

		flush_all_cam_entry(padapter);



		memcpy(pnetwork, pbuf, FIELD_OFFSET(struct wlan_bssid_ex, IELength));

		memcpy(pnetwork, pbuf, offsetof(struct wlan_bssid_ex, IELength));

		pnetwork->IELength = ((struct wlan_bssid_ex *)pbuf)->IELength;



		if (pnetwork->IELength > MAX_IE_SZ)/* Check pbuf->IELength */
@@ -7167,7 +7167,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) 
	pmlmeinfo->candidate_tid_bitmap = 0;

	pmlmeinfo->bwmode_updated = false;



	memcpy(pnetwork, pbuf, FIELD_OFFSET(struct wlan_bssid_ex, IELength));

	memcpy(pnetwork, pbuf, offsetof(struct wlan_bssid_ex, IELength));

	pnetwork->IELength = ((struct wlan_bssid_ex *)pbuf)->IELength;



	if (pnetwork->IELength > MAX_IE_SZ)/* Check pbuf->IELength */

drivers/staging/r8188eu/include/basic_types.h

+0 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 


typedef void (*proc_t)(void *);



#define FIELD_OFFSET(s, field)	((ssize_t)&((s *)(0))->field)



/* port from fw */

/*  TODO: Macros Below are Sync from SD7-Driver. It is necessary

 * to check correctness */

drivers/staging/r8188eu/os_dep/ioctl_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ 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);

			wep_total_len = wep_key_len + offsetof(struct ndis_802_11_wep, KeyMaterial);

			pwep = kzalloc(wep_total_len, GFP_KERNEL);

			if (!pwep)

				goto exit;
@@ -1593,7 +1593,7 @@ static int rtw_wx_set_enc(struct net_device *dev, 
	if (erq->length > 0) {

		wep.KeyLength = erq->length <= 5 ? 5 : 13;



		wep.Length = wep.KeyLength + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);

		wep.Length = wep.KeyLength + offsetof(struct ndis_802_11_wep, KeyMaterial);

	} else {

		wep.KeyLength = 0;