2011-11-29 17:42:03

by Luis R. Rodriguez

Subject: [RFC] prism54: fix compilation warning on wrqu.data.pointer

This fixes this compilation warning:

CHECK drivers/net/wireless/prism54/isl_ioctl.c
drivers/net/wireless/prism54/isl_ioctl.c:2052:27: warning: incorrect type in assignment (different address spaces)
drivers/net/wireless/prism54/isl_ioctl.c:2052:27: expected void [noderef] <asn:1>*pointer
drivers/net/wireless/prism54/isl_ioctl.c:2052:27: got char *[assigned] memptr
drivers/net/wireless/prism54/isl_ioctl.c:2071:27: warning: incorrect type in assignment (different address spaces)
drivers/net/wireless/prism54/isl_ioctl.c:2071:27: expected void [noderef] <asn:1>*pointer
drivers/net/wireless/prism54/isl_ioctl.c:2071:27: got char *[assigned] memptr

The wrqu.data.pointer shouldn't be assigned by the driver, addiotionally
custom wext driver events would simply be dropped anyway.

Cc: Johannes Berg <[email protected]>
Signed-off-by: Luis R. Rodriguez <[email protected]>
---

Johannes, it was unclear to me whether or not wireless_send_event()
no longer supports custom driver events if so then not only was this
bogus but also all the private driver event crap could likely be
removed from prism54 as well.

drivers/net/wireless/prism54/isl_ioctl.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 4e44b1a..862dfea 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2049,7 +2049,6 @@ send_formatted_event(islpci_private *priv, const char *str,
memptr = kmalloc(IW_CUSTOM_MAX, GFP_KERNEL);
if (!memptr)
return;
- wrqu.data.pointer = memptr;
wrqu.data.length = 0;
format_event(priv, memptr, str, mlme, &wrqu.data.length,
error);
@@ -2068,7 +2067,6 @@ send_simple_event(islpci_private *priv, const char *str)
if (!memptr)
return;
BUG_ON(n >= IW_CUSTOM_MAX);
- wrqu.data.pointer = memptr;
wrqu.data.length = n;
strcpy(memptr, str);
wireless_send_event(priv->ndev, IWEVCUSTOM, &wrqu, memptr);
--
1.7.4.15.g7811d

2011-11-29 17:59:46

by Johannes Berg

Subject: Re: [RFC] prism54: fix compilation warning on wrqu.data.pointer

On Tue, 2011-11-29 at 12:41 -0500, Luis R. Rodriguez wrote:
> This fixes this compilation warning:
>
> CHECK drivers/net/wireless/prism54/isl_ioctl.c
> drivers/net/wireless/prism54/isl_ioctl.c:2052:27: warning: incorrect type in assignment (different address spaces)
> drivers/net/wireless/prism54/isl_ioctl.c:2052:27: expected void [noderef] <asn:1>*pointer
> drivers/net/wireless/prism54/isl_ioctl.c:2052:27: got char *[assigned] memptr
> drivers/net/wireless/prism54/isl_ioctl.c:2071:27: warning: incorrect type in assignment (different address spaces)
> drivers/net/wireless/prism54/isl_ioctl.c:2071:27: expected void [noderef] <asn:1>*pointer
> drivers/net/wireless/prism54/isl_ioctl.c:2071:27: got char *[assigned] memptr
>
> The wrqu.data.pointer shouldn't be assigned by the driver, addiotionally
> custom wext driver events would simply be dropped anyway.
>
> Cc: Johannes Berg <[email protected]>
> Signed-off-by: Luis R. Rodriguez <[email protected]>
> ---
>
> Johannes, it was unclear to me whether or not wireless_send_event()
> no longer supports custom driver events if so then not only was this
> bogus but also all the private driver event crap could likely be
> removed from prism54 as well.

Looking at cfg80211_michael_mic_failure() in net/wireless/mlme.c, this
should work.

johannes