net: wireless: bcmdhd: redeclare uint and char pointer

redeclare uint8 and uint pointer to handle 64bit kernel.

bug 1435883

Change-Id: Ic56f78052eb62adc0da6a06903d96298e6868000
Reviewed-on: http://git-master/r/358527
Signed-off-by: Narayan Reddy <narayanr@nvidia.com>
Reviewed-on: http://git-master/r/361710
Reviewed-by: Seema Khowala <seemaj@nvidia.com>
Tested-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>

diff --git a/drivers/net/wireless/bcmdhd/include/typedefs.h b/drivers/net/wireless/bcmdhd/include/typedefs.h
index 61627bc9b04a51c4cc425a56769546b18253be94..2cda875575e3b943d76b2263a27daceb9ef9c09c 100644 (file)
--- a/drivers/net/wireless/bcmdhd/include/typedefs.h
+++ b/drivers/net/wireless/bcmdhd/include/typedefs.h
@@ -212,8 +212,12 @@ typedef unsigned long long uint64;
 #endif
 
 #ifndef TYPEDEF_UINTPTR
+#ifdef CONFIG_COMPAT
+typedef unsigned long long int uintptr;
+#else
 typedef unsigned int   uintptr;
 #endif
+#endif
 
 #ifndef TYPEDEF_INT8
 typedef signed char    int8;

diff --git a/drivers/net/wireless/bcmdhd/wl_android.c b/drivers/net/wireless/bcmdhd/wl_android.c
index 5fc5575bc718871933d52961e761929f80750970..796aba44df05876beae05eb29d11f531fe65342c 100644 (file)
--- a/drivers/net/wireless/bcmdhd/wl_android.c
+++ b/drivers/net/wireless/bcmdhd/wl_android.c
@@ -163,7 +163,11 @@ struct io_cfg {
 };
 
 typedef struct android_wifi_priv_cmd {
+#ifdef CONFIG_COMPAT
+       u32 buf;
+#else
        char *buf;
+#endif
        int used_len;
        int total_len;
 } android_wifi_priv_cmd;