From 913a3449b4ae24ed0c50e3dfb5e9c244462e3cc3 Mon Sep 17 00:00:00 2001 From: Monam Agarwal Date: Thu, 6 Mar 2014 02:35:16 +0530 Subject: [PATCH] Staging: wlags49_h2: Fix incorrect type in assignment in wl_wext.c This patch fixes following sparse warnings: drivers/staging/wlags49_h2/wl_wext.c:3357:28: warning: incorrect type in assignment (different address spaces) drivers/staging/wlags49_h2/wl_wext.c:3357:28: expected void [noderef] *[addressable] [assigned] pointer drivers/staging/wlags49_h2/wl_wext.c:3357:28: got void * drivers/staging/wlags49_h2/wl_wext.c:3422:47: warning: incorrect type in assignment (different address spaces) drivers/staging/wlags49_h2/wl_wext.c:3422:47: expected void [noderef] *[addressable] [assigned] pointer drivers/staging/wlags49_h2/wl_wext.c:3422:47: got char *[usertype] drivers/staging/wlags49_h2/wl_wext.c:3781:21: warning: symbol 'wl_priv_args' was not declared. Should it be static? Signed-off-by: Monam Agarwal Signed-off-by: Greg Kroah-Hartman --- drivers/staging/wlags49_h2/wl_wext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/wlags49_h2/wl_wext.c b/drivers/staging/wlags49_h2/wl_wext.c index 187fc060de26..404fda18eb81 100644 --- a/drivers/staging/wlags49_h2/wl_wext.c +++ b/drivers/staging/wlags49_h2/wl_wext.c @@ -3354,7 +3354,7 @@ void wl_wext_event_essid( struct net_device *dev ) the call to wireless_send_event() must also point to where the ESSID lives */ wrqu.essid.length = strlen( lp->NetworkName ); - wrqu.essid.pointer = (caddr_t)lp->NetworkName; + wrqu.essid.pointer = (void __user *)lp->NetworkName; wrqu.essid.flags = 1; wireless_send_event( dev, SIOCSIWESSID, &wrqu, lp->NetworkName ); @@ -3419,7 +3419,7 @@ void wl_wext_event_encode( struct net_device *dev ) /* Only provide the key if permissions allow */ if( capable( CAP_NET_ADMIN )) { - wrqu.encoding.pointer = (caddr_t)lp->DefaultKeys.key[index].key; + wrqu.encoding.pointer = (void __user *)lp->DefaultKeys.key[index].key; wrqu.encoding.length = lp->DefaultKeys.key[index].len; } else { wrqu.encoding.flags |= IW_ENCODE_NOKEY; -- 2.34.1