replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 From: Joshua Clayton <stillcompiling@xxxxxxxxx> To: Larry Finger <Larry.Finger@xxxxxxxxxxxx>, Florian Schilhabel <florian.c.schilhabel@xxxxxxxxxxxxxx>, Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>, Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>, Nitin Kuppelur <nitinkuppelur@xxxxxxxxx>, Joshua Clayton <stillcompiling@xxxxxxxxx>, Vaishali Thakkar <vthakkar1994@xxxxxxxxx>, Tapasweni Pathak <tapaswenipathak@xxxxxxxxx>, Daniel Baluta <daniel.baluta@xxxxxxxxx>, Melike Yurtoglu <aysemelikeyurtoglu@xxxxxxxxx>, Max Perepelitsyn <mperepelitsyn@xxxxxxxxx>, Aya Mahfouz <mahfouz.saif.elyazal@xxxxxxxxx>, Cristina Opriceana <cristina.opriceana@xxxxxxxxx>, Dogukan Ergun <dogukan.ergun@xxxxxxxxx>, Julia Lawall <Julia.Lawall@xxxxxxx>, Dan Carpenter <dan.carpenter@xxxxxxxxxx>, Haneen Mohammed <hamohammed.sa@xxxxxxxxx>, Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx> Cc: devel@xxxxxxxxxxxxxxxxxxxx, linux-kernel@xxxxxxxxxxxxxxx Subject: [PATCH V3 2/8] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 21:41:11 -0700 Message-Id: <f6e35adbb97dfcedbc6a99efbca0d27fb04a7a50.1438057939.git.stillcompiling@xxxxxxxxx> X-Mailer: git-send-email 2.4.6 In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> In-Reply-To: <cover.1438057939.git.stillcompiling@xxxxxxxxx> References: <cover.1438057939.git.stillcompiling@xxxxxxxxx> replace item-by-item size calculation of a struct with the size of the struct. This gets rid of a use of typedef NDIS_802_11_RATES_EX Signed-off-by: Joshua Clayton <stillcompiling@xxxxxxxxx> --- drivers/staging/rtl8712/rtl871x_cmd.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index e35854d..f07050d 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter) u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) { - uint t_len = 0; struct ndis_wlan_bssid_ex *psecnetwork; struct cmd_obj *pcmd; struct cmd_priv *pcmdpriv = &padapter->cmdpriv; @@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); if (pcmd == NULL) return _FAIL; - t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 + - sizeof(struct ndis_802_11_ssid) + sizeof(u32) + - sizeof(s32) + - sizeof(enum NDIS_802_11_NETWORK_TYPE) + - sizeof(struct NDIS_802_11_CONFIGURATION) + - sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) + - sizeof(NDIS_802_11_RATES_EX) + - sizeof(u32) + MAX_IE_SZ; /* for hidden ap to set fw_state here */ if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) != @@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) kfree(pcmd); return _FAIL; } - memcpy(psecnetwork, &pnetwork->network, t_len); + memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork)); psecuritypriv->authenticator_ie[0] = (unsigned char) psecnetwork->IELength; if ((psecnetwork->IELength-12) < (256 - 1)) -- 2.4.6 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel