From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH v4 REPOST 2/8] staging: rtl8712: simplify size calculation
Date: Wed, 5 Aug 2015 17:17:15 -0700 [thread overview]
Message-ID: <3242589f3c7e044ef8896e2b3faa07cdf5363168.1438778593.git.stillcompiling@gmail.com> (raw)
In-Reply-To: <cover.1438778593.git.stillcompiling@gmail.com>
In-Reply-To: <cover.1438778593.git.stillcompiling@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 <stillcompiling@gmail.com>
---
drivers/staging/rtl8712/rtl871x_cmd.c | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.5.0
next prev parent reply other threads:[~2015-08-06 0:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-06 0:17 [PATCH v4 REPOST 0/8] clean up wlan_bssdef.h Joshua Clayton
2015-08-06 0:17 ` [PATCH v4 REPOST 1/8] staging: rtl8712: fix buggy size calculation Joshua Clayton
2015-08-06 0:17 ` Joshua Clayton [this message]
2015-08-06 0:17 ` [PATCH v4 REPOST 3/8] staging: rtl8712: fix comment Joshua Clayton
2015-08-06 0:17 ` [PATCH v4 REPOST 4/8] staging: rtl8712: removed unused wrapper structs Joshua Clayton
2015-08-06 0:17 ` [PATCH v4 REPOST 5/8] staging: rtl8712: remove duplicate struct Joshua Clayton
2015-08-06 0:17 ` [PATCH v4 REPOST 6/8] staging: rtl8712: rename function Joshua Clayton
2015-08-06 0:17 ` [PATCH v4 REPOST 7/8] staging: rtl8712: remove typedefs Joshua Clayton
2015-08-06 0:17 ` [PATCH v4 REPOST 8/8] staging: rtl8712: change SupportedRates to rates Joshua Clayton
2015-08-06 8:06 ` [PATCH v4 REPOST 0/8] clean up wlan_bssdef.h Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3242589f3c7e044ef8896e2b3faa07cdf5363168.1438778593.git.stillcompiling@gmail.com \
--to=stillcompiling@gmail.com \
--cc=Julia.Lawall@lip6.fr \
--cc=Larry.Finger@lwfinger.net \
--cc=dan.carpenter@oracle.com \
--cc=devel@driverdev.osuosl.org \
--cc=florian.c.schilhabel@googlemail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nitinkuppelur@gmail.com \
--cc=sudipm.mukherjee@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®