* [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
2015-07-27 14:31 [PATCH V2 0/6] clean up wlan_bssdef.h Joshua Clayton
@ 2015-07-27 14:31 ` Joshua Clayton
2015-07-27 14:31 ` [PATCH V2 2/6] staging: rtl8712: simplify " Joshua Clayton
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Joshua Clayton @ 2015-07-27 14:31 UTC (permalink / raw)
To: Larry Finger, Florian Schilhabel, Greg Kroah-Hartman,
Sudip Mukherjee, Nitin Kuppelur, Joshua Clayton, Vaishali Thakkar,
Tapasweni Pathak, Daniel Baluta, Melike Yurtoglu,
Max Perepelitsyn, Aya Mahfouz, Cristina Opriceana, Dogukan Ergun,
Julia Lawall, Dan Carpenter, Haneen Mohammed, Rickard Strandqvist
Cc: devel, linux-kernel
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation
Date: Mon, 27 Jul 2015 07:31:49 -0700
Message-Id: <1438007514-9228-2-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
r8712_get_ndis_wlan_bssid_ex_sz has a "6 * sizeof(unsigned long)"
where the underlying struct has a 6 * unsigned char.
Simplify the calculation by just subtracting the variable part from
the size of the struct.
This also gets rid of a use of typedef NDIS_802_11_RATES_EX
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c
index c044b0e..6b3451f 100644
--- a/drivers/staging/rtl8712/rtl871x_mlme.c
+++ b/drivers/staging/rtl8712/rtl871x_mlme.c
@@ -210,17 +210,7 @@ void r8712_generate_random_ibss(u8 *pibss)
uint r8712_get_ndis_wlan_bssid_ex_sz(struct ndis_wlan_bssid_ex *bss)
{
- uint t_len;
-
- t_len = sizeof(u32) + 6 * sizeof(unsigned long) + 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) + bss->IELength;
- return t_len;
+ return sizeof(*bss) + bss->IELength - MAX_IE_SZ;
}
u8 *r8712_get_capability_from_ie(u8 *ie)
--
2.4.6
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V2 2/6] staging: rtl8712: simplify size calculation
2015-07-27 14:31 [PATCH V2 0/6] clean up wlan_bssdef.h Joshua Clayton
2015-07-27 14:31 ` [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation Joshua Clayton
@ 2015-07-27 14:31 ` Joshua Clayton
2015-07-27 14:31 ` [PATCH V2 3/6] staging: rtl8712: fix comment Joshua Clayton
2015-07-27 16:40 ` [PATCH V2 0/6] clean up wlan_bssdef.h Joshua Clayton
3 siblings, 0 replies; 6+ messages in thread
From: Joshua Clayton @ 2015-07-27 14:31 UTC (permalink / raw)
To: Larry Finger, Florian Schilhabel, Greg Kroah-Hartman,
Sudip Mukherjee, Nitin Kuppelur, Joshua Clayton, Vaishali Thakkar,
Tapasweni Pathak, Daniel Baluta, Melike Yurtoglu,
Max Perepelitsyn, Aya Mahfouz, Cristina Opriceana, Dogukan Ergun,
Julia Lawall, Dan Carpenter, Haneen Mohammed, Rickard Strandqvist
Cc: devel, linux-kernel
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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index e35854d..f07050d 100644
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -471,7 +471,6 @@ u8 r8712_createbss_cmd(struct _adapter *padapter)
u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
{
- uint t_len = 0;
struct ndis_wlan_bssid_ex *psecnetwork;
struct cmd_obj *pcmd;
struct cmd_priv *pcmdpriv = &padapter->cmdpriv;
@@ -486,14 +485,6 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (pcmd == NULL)
return _FAIL;
- t_len = sizeof(u32) + 6 * sizeof(unsigned char) + 2 +
- sizeof(struct ndis_802_11_ssid) + sizeof(u32) +
- sizeof(s32) +
- sizeof(enum NDIS_802_11_NETWORK_TYPE) +
- sizeof(struct NDIS_802_11_CONFIGURATION) +
- sizeof(enum NDIS_802_11_NETWORK_INFRASTRUCTURE) +
- sizeof(NDIS_802_11_RATES_EX) +
- sizeof(u32) + MAX_IE_SZ;
/* for hidden ap to set fw_state here */
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) !=
@@ -516,7 +507,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork)
kfree(pcmd);
return _FAIL;
}
- memcpy(psecnetwork, &pnetwork->network, t_len);
+ memcpy(psecnetwork, &pnetwork->network, sizeof(*psecnetwork));
psecuritypriv->authenticator_ie[0] = (unsigned char)
psecnetwork->IELength;
if ((psecnetwork->IELength-12) < (256 - 1))
--
2.4.6
From: Joshua Clayton <stillcompiling@gmail.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
Florian Schilhabel <florian.c.schilhabel@googlemail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@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-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-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>
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
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V2 3/6] staging: rtl8712: fix comment
2015-07-27 14:31 [PATCH V2 0/6] clean up wlan_bssdef.h Joshua Clayton
2015-07-27 14:31 ` [PATCH V2 1/6] staging: rtl8712: fix buggy size calculation Joshua Clayton
2015-07-27 14:31 ` [PATCH V2 2/6] staging: rtl8712: simplify " Joshua Clayton
@ 2015-07-27 14:31 ` Joshua Clayton
2015-07-27 16:40 ` [PATCH V2 0/6] clean up wlan_bssdef.h Joshua Clayton
3 siblings, 0 replies; 6+ messages in thread
From: Joshua Clayton @ 2015-07-27 14:31 UTC (permalink / raw)
To: Larry Finger, Florian Schilhabel, Greg Kroah-Hartman,
Sudip Mukherjee, Nitin Kuppelur, Joshua Clayton, Vaishali Thakkar,
Tapasweni Pathak, Daniel Baluta, Melike Yurtoglu,
Max Perepelitsyn, Aya Mahfouz, Cristina Opriceana, Dogukan Ergun,
Julia Lawall, Dan Carpenter, Haneen Mohammed, Rickard Strandqvist
Cc: devel, linux-kernel
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
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>,
Sudip Mukherjee <sudipm.mukherjee@gmail.com>,
Nitin Kuppelur <nitinkuppelur@gmail.com>,
Joshua Clayton <stillcompiling@gmail.com>,
Vaishali Thakkar <vthakkar1994@gmail.com>,
Tapasweni Pathak <tapaswenipathak@gmail.com>,
Daniel Baluta <daniel.baluta@intel.com>,
Melike Yurtoglu <aysemelikeyurtoglu@gmail.com>,
Max Perepelitsyn <mperepelitsyn@gmail.com>,
Aya Mahfouz <mahfouz.saif.elyazal@gmail.com>,
Cristina Opriceana <cristina.opriceana@gmail.com>,
Dogukan Ergun <dogukan.ergun@gmail.com>,
Julia Lawall <Julia.Lawall@lip6.fr>,
Dan Carpenter <dan.carpenter@oracle.com>,
Haneen Mohammed <hamohammed.sa@gmail.com>,
Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Cc: devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org
Subject: [PATCH V2 3/6] staging: rtl8712: fix comment
Date: Mon, 27 Jul 2015 07:31:51 -0700
Message-Id: <1438007514-9228-4-git-send-email-stillcompiling@gmail.com>
X-Mailer: git-send-email 2.4.6
In-Reply-To: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
References: <1438007514-9228-1-git-send-email-stillcompiling@gmail.com>
The old comment refers to a typedef name which is being removed,
and to a style of calculation which is no longer being used.
It falsely states that IELength is variable length, instead of IEs.
Change comment to simply state that the IEs field is a buffer of
variable size and that IELength refers to the current size.
Signed-off-by: Joshua Clayton <stillcompiling@gmail.com>
diff --git a/drivers/staging/rtl8712/wlan_bssdef.h b/drivers/staging/rtl8712/wlan_bssdef.h
index 2ea8a3d..8c5d6e7 100644
--- a/drivers/staging/rtl8712/wlan_bssdef.h
+++ b/drivers/staging/rtl8712/wlan_bssdef.h
@@ -83,17 +83,6 @@ struct NDIS_802_11_FIXED_IEs {
u16 Capabilities;
};
-/*
- * Length is the 4 bytes multiples of the sume of
- * 6 * sizeof (unsigned char) + 2 + sizeof (ndis_802_11_ssid) + sizeof (u32)
- * + sizeof (s32) + sizeof (NDIS_802_11_NETWORK_TYPE)
- * + sizeof (struct NDIS_802_11_CONFIGURATION)
- * + sizeof (NDIS_802_11_RATES_EX) + IELength
-
- * Except the IELength, all other fields are fixed length. Therefore, we can
- * define a macro to present the partial sum.
- */
-
struct ndis_wlan_bssid_ex {
u32 Length;
unsigned char MacAddress[6];
@@ -105,6 +94,7 @@ struct ndis_wlan_bssid_ex {
struct NDIS_802_11_CONFIGURATION Configuration;
enum NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode;
NDIS_802_11_RATES_EX SupportedRates;
+ /* number of content bytes in EIs, which varies */
u32 IELength;
/*(timestamp, beacon interval, and capability information) */
u8 IEs[MAX_IE_SZ];
--
2.4.6
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH V2 0/6] clean up wlan_bssdef.h
2015-07-27 14:31 [PATCH V2 0/6] clean up wlan_bssdef.h Joshua Clayton
` (2 preceding siblings ...)
2015-07-27 14:31 ` [PATCH V2 3/6] staging: rtl8712: fix comment Joshua Clayton
@ 2015-07-27 16:40 ` Joshua Clayton
3 siblings, 0 replies; 6+ messages in thread
From: Joshua Clayton @ 2015-07-27 16:40 UTC (permalink / raw)
To: Larry Finger
Cc: Florian Schilhabel, Greg Kroah-Hartman, Sudip Mukherjee,
Nitin Kuppelur, Vaishali Thakkar, Tapasweni Pathak, Daniel Baluta,
Melike Yurtoglu, Max Perepelitsyn, Aya Mahfouz,
Cristina Opriceana, Dogukan Ergun, Julia Lawall, Dan Carpenter,
Haneen Mohammed, Rickard Strandqvist, devel, linux-kernel
Apologies all,
Patch 4 of 6 is triggering an error in git-send-email apparently caused by perl 5.22.
also seen here:
http://www.spinics.net/lists/git/msg255933.html
It did not happen when I test emailed the patch series to myself.
I can look into it after work.
--
~Joshua Clayton
^ permalink raw reply [flat|nested] 6+ messages in thread