* [PATCH] Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions
@ 2015-10-22 10:11 Shivani Bhardwaj
0 siblings, 0 replies; 4+ messages in thread
From: Shivani Bhardwaj @ 2015-10-22 10:11 UTC (permalink / raw)
To: outreachy-kernel
Remove the wrapper functions get_address1, get_address2 and get_address3
as they are not required and replace their calls by suitable functions.
Semantic patch used:
@@
identifier f,g;
@@
*f(...) {
g(...); }
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
---
drivers/staging/wilc1000/coreconfigurator.c | 38 ++++++++++-------------------
1 file changed, 13 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 427adfd..38bc2c4 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -171,38 +171,26 @@ static inline u8 get_from_ds(u8 *header)
return ((header[1] & 0x02) >> 1);
}
-/* This function extracts the MAC Address in 'address1' field of the MAC */
-/* header and updates the MAC Address in the allocated 'addr' variable. */
-static inline void get_address1(u8 *pu8msa, u8 *addr)
-{
- memcpy(addr, pu8msa + 4, 6);
-}
-
-/* This function extracts the MAC Address in 'address2' field of the MAC */
-/* header and updates the MAC Address in the allocated 'addr' variable. */
-static inline void get_address2(u8 *pu8msa, u8 *addr)
-{
- memcpy(addr, pu8msa + 10, 6);
-}
-
-/* This function extracts the MAC Address in 'address3' field of the MAC */
-/* header and updates the MAC Address in the allocated 'addr' variable. */
-static inline void get_address3(u8 *pu8msa, u8 *addr)
-{
- memcpy(addr, pu8msa + 16, 6);
-}
-
/* This function extracts the BSSID from the incoming WLAN packet based on */
-/* the 'from ds' bit, and updates the MAC Address in the allocated 'addr' */
+/* the 'from ds' bit, and updates the MAC Address in the allocated 'data' */
/* variable. */
static inline void get_BSSID(u8 *data, u8 *bssid)
{
if (get_from_ds(data) == 1)
- get_address2(data, bssid);
+ /* Extract the MAC Address in 'address2' field of the MAC */
+ /* header and update the MAC Address in the allocated 'data'
+ * variable. */
+ memcpy(data, bssid + 10, 6);
else if (get_to_ds(data) == 1)
- get_address1(data, bssid);
+ /* Extract the MAC Address in 'address1' field of the MAC */
+ /* header and update the MAC Address in the allocated 'data'
+ * variable. */
+ memcpy(data, bssid + 4, 6);
else
- get_address3(data, bssid);
+ /* Extract the MAC Address in 'address3' field of the MAC */
+ /* header and update the MAC Address in the allocated 'data'
+ * variable. */
+ memcpy(data, bssid + 16, 6);
}
/* This function extracts the SSID from a beacon/probe response frame */
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions
@ 2015-10-22 12:53 Shivani Bhardwaj
2015-10-22 13:01 ` [Outreachy kernel] " Julia Lawall
0 siblings, 1 reply; 4+ messages in thread
From: Shivani Bhardwaj @ 2015-10-22 12:53 UTC (permalink / raw)
To: outreachy-kernel
Remove the wrapper functions get_address1, get_address2 and get_address3
as they are not required and replace their calls by suitable functions.
Semantic patch used:
@@
identifier f,g;
@@
*f(...) {
g(...); }
Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
---
drivers/staging/wilc1000/coreconfigurator.c | 48 ++++++++++++++---------------
1 file changed, 23 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
index 427adfd..6dfe26d 100644
--- a/drivers/staging/wilc1000/coreconfigurator.c
+++ b/drivers/staging/wilc1000/coreconfigurator.c
@@ -13,8 +13,12 @@
#include "wilc_wlan.h"
#include <linux/errno.h>
#include <linux/slab.h>
+#include <linux/etherdevice.h>
#define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \
BEACON_INTERVAL_LEN + CAP_INFO_LEN)
+#define ADDR1 4
+#define ADDR2 10
+#define ADDR3 16
/* Basic Frame Type Codes (2-bit) */
enum basic_frame_type {
@@ -171,38 +175,32 @@ static inline u8 get_from_ds(u8 *header)
return ((header[1] & 0x02) >> 1);
}
-/* This function extracts the MAC Address in 'address1' field of the MAC */
-/* header and updates the MAC Address in the allocated 'addr' variable. */
-static inline void get_address1(u8 *pu8msa, u8 *addr)
-{
- memcpy(addr, pu8msa + 4, 6);
-}
-
-/* This function extracts the MAC Address in 'address2' field of the MAC */
-/* header and updates the MAC Address in the allocated 'addr' variable. */
-static inline void get_address2(u8 *pu8msa, u8 *addr)
-{
- memcpy(addr, pu8msa + 10, 6);
-}
-
-/* This function extracts the MAC Address in 'address3' field of the MAC */
-/* header and updates the MAC Address in the allocated 'addr' variable. */
-static inline void get_address3(u8 *pu8msa, u8 *addr)
-{
- memcpy(addr, pu8msa + 16, 6);
-}
-
/* This function extracts the BSSID from the incoming WLAN packet based on */
-/* the 'from ds' bit, and updates the MAC Address in the allocated 'addr' */
+/* the 'from ds' bit, and updates the MAC Address in the allocated 'data' */
/* variable. */
static inline void get_BSSID(u8 *data, u8 *bssid)
{
if (get_from_ds(data) == 1)
- get_address2(data, bssid);
+ /*
+ * Extract the MAC Address in 'address2' field of the MAC
+ * header and update the MAC Address in the allocated 'data'
+ * variable.
+ */
+ ether_addr_copy(data, bssid + ADDR2);
else if (get_to_ds(data) == 1)
- get_address1(data, bssid);
+ /*
+ * Extract the MAC Address in 'address1' field of the MAC
+ * header and update the MAC Address in the allocated 'data'
+ * variable.
+ */
+ ether_addr_copy(data, bssid + ADDR1);
else
- get_address3(data, bssid);
+ /*
+ * Extract the MAC Address in 'address3' field of the MAC
+ * header and update the MAC Address in the allocated 'data'
+ * variable.
+ */
+ ether_addr_copy(data, bssid + ADDR3);
}
/* This function extracts the SSID from a beacon/probe response frame */
--
2.1.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Outreachy kernel] [PATCH] Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions
2015-10-22 12:53 [PATCH] Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions Shivani Bhardwaj
@ 2015-10-22 13:01 ` Julia Lawall
2015-10-22 13:02 ` Shivani Bhardwaj
0 siblings, 1 reply; 4+ messages in thread
From: Julia Lawall @ 2015-10-22 13:01 UTC (permalink / raw)
To: Shivani Bhardwaj; +Cc: outreachy-kernel
On Thu, 22 Oct 2015, Shivani Bhardwaj wrote:
> Remove the wrapper functions get_address1, get_address2 and get_address3
> as they are not required and replace their calls by suitable functions.
"not required" and "suitable" are not very precise. Something like
Replace the wrapper functions ... by the standard kernel function ...
could be better.
> Semantic patch used:
>
> @@
> identifier f,g;
> @@
>
> *f(...) {
> g(...); }
It's not clear what the semantic patch was used for. Actually it was used
to find the wrapper functions, but not to do the transformation. This
could also be more clear.
It could be good to resend.
julia
> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
> ---
> drivers/staging/wilc1000/coreconfigurator.c | 48 ++++++++++++++---------------
> 1 file changed, 23 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
> index 427adfd..6dfe26d 100644
> --- a/drivers/staging/wilc1000/coreconfigurator.c
> +++ b/drivers/staging/wilc1000/coreconfigurator.c
> @@ -13,8 +13,12 @@
> #include "wilc_wlan.h"
> #include <linux/errno.h>
> #include <linux/slab.h>
> +#include <linux/etherdevice.h>
> #define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \
> BEACON_INTERVAL_LEN + CAP_INFO_LEN)
> +#define ADDR1 4
> +#define ADDR2 10
> +#define ADDR3 16
>
> /* Basic Frame Type Codes (2-bit) */
> enum basic_frame_type {
> @@ -171,38 +175,32 @@ static inline u8 get_from_ds(u8 *header)
> return ((header[1] & 0x02) >> 1);
> }
>
> -/* This function extracts the MAC Address in 'address1' field of the MAC */
> -/* header and updates the MAC Address in the allocated 'addr' variable. */
> -static inline void get_address1(u8 *pu8msa, u8 *addr)
> -{
> - memcpy(addr, pu8msa + 4, 6);
> -}
> -
> -/* This function extracts the MAC Address in 'address2' field of the MAC */
> -/* header and updates the MAC Address in the allocated 'addr' variable. */
> -static inline void get_address2(u8 *pu8msa, u8 *addr)
> -{
> - memcpy(addr, pu8msa + 10, 6);
> -}
> -
> -/* This function extracts the MAC Address in 'address3' field of the MAC */
> -/* header and updates the MAC Address in the allocated 'addr' variable. */
> -static inline void get_address3(u8 *pu8msa, u8 *addr)
> -{
> - memcpy(addr, pu8msa + 16, 6);
> -}
> -
> /* This function extracts the BSSID from the incoming WLAN packet based on */
> -/* the 'from ds' bit, and updates the MAC Address in the allocated 'addr' */
> +/* the 'from ds' bit, and updates the MAC Address in the allocated 'data' */
> /* variable. */
> static inline void get_BSSID(u8 *data, u8 *bssid)
> {
> if (get_from_ds(data) == 1)
> - get_address2(data, bssid);
> + /*
> + * Extract the MAC Address in 'address2' field of the MAC
> + * header and update the MAC Address in the allocated 'data'
> + * variable.
> + */
> + ether_addr_copy(data, bssid + ADDR2);
> else if (get_to_ds(data) == 1)
> - get_address1(data, bssid);
> + /*
> + * Extract the MAC Address in 'address1' field of the MAC
> + * header and update the MAC Address in the allocated 'data'
> + * variable.
> + */
> + ether_addr_copy(data, bssid + ADDR1);
> else
> - get_address3(data, bssid);
> + /*
> + * Extract the MAC Address in 'address3' field of the MAC
> + * header and update the MAC Address in the allocated 'data'
> + * variable.
> + */
> + ether_addr_copy(data, bssid + ADDR3);
> }
>
> /* This function extracts the SSID from a beacon/probe response frame */
> --
> 2.1.0
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> To post to this group, send email to outreachy-kernel@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20151022125333.GA21176%40ubuntu.
> For more options, visit https://groups.google.com/d/optout.
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Outreachy kernel] [PATCH] Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions
2015-10-22 13:01 ` [Outreachy kernel] " Julia Lawall
@ 2015-10-22 13:02 ` Shivani Bhardwaj
0 siblings, 0 replies; 4+ messages in thread
From: Shivani Bhardwaj @ 2015-10-22 13:02 UTC (permalink / raw)
To: Julia Lawall; +Cc: outreachy-kernel
On Thu, Oct 22, 2015 at 6:31 PM, Julia Lawall <julia.lawall@lip6.fr> wrote:
> On Thu, 22 Oct 2015, Shivani Bhardwaj wrote:
>
>> Remove the wrapper functions get_address1, get_address2 and get_address3
>> as they are not required and replace their calls by suitable functions.
>
> "not required" and "suitable" are not very precise. Something like
>
> Replace the wrapper functions ... by the standard kernel function ...
>
> could be better.
>
>> Semantic patch used:
>>
>> @@
>> identifier f,g;
>> @@
>>
>> *f(...) {
>> g(...); }
>
> It's not clear what the semantic patch was used for. Actually it was used
> to find the wrapper functions, but not to do the transformation. This
> could also be more clear.
>
> It could be good to resend.
>
> julia
>
All right. I'm sending v3.
Thank you.
>> Signed-off-by: Shivani Bhardwaj <shivanib134@gmail.com>
>> ---
>> drivers/staging/wilc1000/coreconfigurator.c | 48 ++++++++++++++---------------
>> 1 file changed, 23 insertions(+), 25 deletions(-)
>>
>> diff --git a/drivers/staging/wilc1000/coreconfigurator.c b/drivers/staging/wilc1000/coreconfigurator.c
>> index 427adfd..6dfe26d 100644
>> --- a/drivers/staging/wilc1000/coreconfigurator.c
>> +++ b/drivers/staging/wilc1000/coreconfigurator.c
>> @@ -13,8 +13,12 @@
>> #include "wilc_wlan.h"
>> #include <linux/errno.h>
>> #include <linux/slab.h>
>> +#include <linux/etherdevice.h>
>> #define TAG_PARAM_OFFSET (MAC_HDR_LEN + TIME_STAMP_LEN + \
>> BEACON_INTERVAL_LEN + CAP_INFO_LEN)
>> +#define ADDR1 4
>> +#define ADDR2 10
>> +#define ADDR3 16
>>
>> /* Basic Frame Type Codes (2-bit) */
>> enum basic_frame_type {
>> @@ -171,38 +175,32 @@ static inline u8 get_from_ds(u8 *header)
>> return ((header[1] & 0x02) >> 1);
>> }
>>
>> -/* This function extracts the MAC Address in 'address1' field of the MAC */
>> -/* header and updates the MAC Address in the allocated 'addr' variable. */
>> -static inline void get_address1(u8 *pu8msa, u8 *addr)
>> -{
>> - memcpy(addr, pu8msa + 4, 6);
>> -}
>> -
>> -/* This function extracts the MAC Address in 'address2' field of the MAC */
>> -/* header and updates the MAC Address in the allocated 'addr' variable. */
>> -static inline void get_address2(u8 *pu8msa, u8 *addr)
>> -{
>> - memcpy(addr, pu8msa + 10, 6);
>> -}
>> -
>> -/* This function extracts the MAC Address in 'address3' field of the MAC */
>> -/* header and updates the MAC Address in the allocated 'addr' variable. */
>> -static inline void get_address3(u8 *pu8msa, u8 *addr)
>> -{
>> - memcpy(addr, pu8msa + 16, 6);
>> -}
>> -
>> /* This function extracts the BSSID from the incoming WLAN packet based on */
>> -/* the 'from ds' bit, and updates the MAC Address in the allocated 'addr' */
>> +/* the 'from ds' bit, and updates the MAC Address in the allocated 'data' */
>> /* variable. */
>> static inline void get_BSSID(u8 *data, u8 *bssid)
>> {
>> if (get_from_ds(data) == 1)
>> - get_address2(data, bssid);
>> + /*
>> + * Extract the MAC Address in 'address2' field of the MAC
>> + * header and update the MAC Address in the allocated 'data'
>> + * variable.
>> + */
>> + ether_addr_copy(data, bssid + ADDR2);
>> else if (get_to_ds(data) == 1)
>> - get_address1(data, bssid);
>> + /*
>> + * Extract the MAC Address in 'address1' field of the MAC
>> + * header and update the MAC Address in the allocated 'data'
>> + * variable.
>> + */
>> + ether_addr_copy(data, bssid + ADDR1);
>> else
>> - get_address3(data, bssid);
>> + /*
>> + * Extract the MAC Address in 'address3' field of the MAC
>> + * header and update the MAC Address in the allocated 'data'
>> + * variable.
>> + */
>> + ether_addr_copy(data, bssid + ADDR3);
>> }
>>
>> /* This function extracts the SSID from a beacon/probe response frame */
>> --
>> 2.1.0
>>
>> --
>> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
>> To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
>> To post to this group, send email to outreachy-kernel@googlegroups.com.
>> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20151022125333.GA21176%40ubuntu.
>> For more options, visit https://groups.google.com/d/optout.
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-10-22 13:02 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-22 12:53 [PATCH] Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions Shivani Bhardwaj
2015-10-22 13:01 ` [Outreachy kernel] " Julia Lawall
2015-10-22 13:02 ` Shivani Bhardwaj
-- strict thread matches above, loose matches on Subject: below --
2015-10-22 10:11 Shivani Bhardwaj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.