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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> To: Larry Finger <larry.fin...@lwfinger.net>, Florian Schilhabel <florian.c.schilha...@googlemail.com>, Greg Kroah-Hartman <gre...@linuxfoundation.org>, Sudip Mukherjee <sudipm.mukher...@gmail.com>, Nitin Kuppelur <nitinkuppe...@gmail.com>, Joshua Clayton <stillcompil...@gmail.com>, Vaishali Thakkar <vthakkar1...@gmail.com>, Tapasweni Pathak <tapaswenipat...@gmail.com>, Daniel Baluta <daniel.bal...@intel.com>, Melike Yurtoglu <aysemelikeyurto...@gmail.com>, Max Perepelitsyn <mperepelit...@gmail.com>, Aya Mahfouz <mahfouz.saif.elya...@gmail.com>, Cristina Opriceana <cristina.oprice...@gmail.com>, Dogukan Ergun <dogukan.er...@gmail.com>, Julia Lawall <julia.law...@lip6.fr>, Dan Carpenter <dan.carpen...@oracle.com>, Haneen Mohammed <hamohammed...@gmail.com>, Rickard Strandqvist <rickard_strandqv...@spectrumdigital.se> Cc: de...@driverdev.osuosl.org, linux-ker...@vger.kernel.org Subject: [PATCH V2 2/6] staging: rtl8712: simplify size calculation Date: Mon, 27 Jul 2015 07:31:50 -0700 Message-Id: <1438007514-9228-3-git-send-email-stillcompil...@gmail.com> X-Mailer: git-send-email 2.4.6 In-Reply-To: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> References: <1438007514-9228-1-git-send-email-stillcompil...@gmail.com> 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 <stillcompil...@gmail.com> 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 de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel