2017-04-26 16:16:04

by Karim Eshapa

Subject: [PATCH] drivers:staging:wlan-ng:hfa384x_usb: Fixing sparse warnings.

Fixing sparse warnings incorrect type assignment.

Signed-off-by: Karim Eshapa <[email protected]>
---
drivers/staging/wlan-ng/hfa384x_usb.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index 6134eba..cf6bf65 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -3511,20 +3511,24 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,
datap = skb_put(skb, sizeof(struct p80211_caphdr));
caphdr = (struct p80211_caphdr *)datap;

- caphdr->version = htonl(P80211CAPTURE_VERSION);
- caphdr->length = htonl(sizeof(struct p80211_caphdr));
+ caphdr->version = __be32_to_cpu(htonl(P80211CAPTURE_VERSION));
+ caphdr->length = __be32_to_cpu( htonl(sizeof(
+ struct p80211_caphdr)));
caphdr->mactime = __cpu_to_be64(rxdesc->time) * 1000;
caphdr->hosttime = __cpu_to_be64(jiffies);
- caphdr->phytype = htonl(4); /* dss_dot11_b */
- caphdr->channel = htonl(hw->sniff_channel);
- caphdr->datarate = htonl(rxdesc->rate);
- caphdr->antenna = htonl(0); /* unknown */
- caphdr->priority = htonl(0); /* unknown */
- caphdr->ssi_type = htonl(3); /* rssi_raw */
+
+ /* dss_dot11_b */
+ caphdr->phytype = __be32_to_cpu(htonl(4));
+
+ caphdr->channel = __be32_to_cpu(htonl(hw->sniff_channel));
+ caphdr->datarate = __be32_to_cpu(htonl(rxdesc->rate));
+ caphdr->antenna = __be32_to_cpu(htonl(0)); /* unknown */
+ caphdr->priority = __be32_to_cpu(htonl(0)); /* unknown */
+ caphdr->ssi_type = __be32_to_cpu(htonl(3)); /* rssi_raw */
caphdr->ssi_signal = htonl(rxdesc->signal);
caphdr->ssi_noise = htonl(rxdesc->silence);
- caphdr->preamble = htonl(0); /* unknown */
- caphdr->encoding = htonl(1); /* cck */
+ caphdr->preamble = __be32_to_cpu(htonl(0)); /* unknown */
+ caphdr->encoding = __be32_to_cpu(htonl(1)); /* cck */
}

/* Copy the 802.11 header to the skb
--
2.7.4

2017-04-28 10:03:28

by Greg Kroah-Hartman

Subject: Re: [PATCH] drivers:staging:wlan-ng:hfa384x_usb: Fixing sparse warnings.

On Wed, Apr 26, 2017 at 06:15:40PM +0200, Karim Eshapa wrote:
> Fixing sparse warnings incorrect type assignment.
>
> Signed-off-by: Karim Eshapa <[email protected]>
> ---
> drivers/staging/wlan-ng/hfa384x_usb.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
> index 6134eba..cf6bf65 100644
> --- a/drivers/staging/wlan-ng/hfa384x_usb.c
> +++ b/drivers/staging/wlan-ng/hfa384x_usb.c
> @@ -3511,20 +3511,24 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,
> datap = skb_put(skb, sizeof(struct p80211_caphdr));
> caphdr = (struct p80211_caphdr *)datap;
>
> - caphdr->version = htonl(P80211CAPTURE_VERSION);
> - caphdr->length = htonl(sizeof(struct p80211_caphdr));
> + caphdr->version = __be32_to_cpu(htonl(P80211CAPTURE_VERSION));
> + caphdr->length = __be32_to_cpu( htonl(sizeof(
> + struct p80211_caphdr)));

How do you know this is correct? And why the odd ' ' usage? I can't
take this patch for that reason alone...

thanks,

greg k-h

2017-04-30 16:26:16

by Karim Eshapa

Subject: RE:[PATCH] drivers:staging:wlan-ng:hfa384x_usb: Fixing sparse warnings.

On Fri, 28 Apr 2017 12:02:58 +0200, Greg KH wrote:
> On Wed, Apr 26, 2017 at 06:15:40PM +0200, Karim Eshapa wrote:
>
>> Fixing sparse warnings incorrect type assignment.
>>
>> Signed-off-by: Karim Eshapa <[email protected]>
>> ---
>> drivers/staging/wlan-ng/hfa384x_usb.c | 24 ++++++++++++++----------
>> 1 file changed, 14 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
>> index 6134eba..cf6bf65 100644
>> --- a/drivers/staging/wlan-ng/hfa384x_usb.c
>> +++ b/drivers/staging/wlan-ng/hfa384x_usb.c
>> @@ -3511,20 +3511,24 @@ static void hfa384x_int_rxmonitor(struct wlandevice *wlandev,
>> datap = skb_put(skb, sizeof(struct p80211_caphdr));
>> caphdr = (struct p80211_caphdr *)datap;
>>
>> - caphdr->version = htonl(P80211CAPTURE_VERSION);
>> - caphdr->length = htonl(sizeof(struct p80211_caphdr));
>> + caphdr->version = __be32_to_cpu(htonl(P80211CAPTURE_VERSION));
>> + caphdr->length = __be32_to_cpu( htonl(sizeof(
>> + struct p80211_caphdr)));
>>

> How do you know this is correct? And why the odd ' ' usage? I can't
> take this patch for that reason alone...
>

Actually using __be32_to_cpu may result in a problem if it's built for le machine.
becasue if the network byte order needs to be represented in __be32 such that the
header is going through the network in a right order.
So, I suggest if we can change the structure's args type into __be32 that I don't
trust it if it can force the arg to be big endian as it's defined as __attribute__((bitwise))
that I'm not sure if it's GNU C attribute.
that I didn't want from the beginning.

Thanks,
Karim