From 8c9754a16b46a891aa781a66f4168df327b21f71 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 5 Oct 2010 11:11:46 -0700
Subject: [PATCH] --- yaml --- r: 220071 b: refs/heads/master c:
 d7e508880b8f674aa82d3d5d9b2de27c034329a3 h: refs/heads/master i:   220069:
 32aeb75e9737ada07ab0f4a38f6d7ca385c78c6d   220067:
 e39c7cc6bbd711a7e7498bd01020fef1114942fe   220063:
 1c8d35ba17a8f55fd5b03b0c898e44131d545dad v: v3

---
 [refs]                                              | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c | 6 +++---
 trunk/drivers/staging/brcm80211/include/bcmutils.h  | 2 +-
 trunk/drivers/staging/brcm80211/include/typedefs.h  | 6 ------
 trunk/drivers/staging/brcm80211/include/wlioctl.h   | 4 ++--
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 3159b7208b89..2e7609bc4cb2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 580a0bd9b71d8e4e63e0720e64f339c740448c98
+refs/heads/master: d7e508880b8f674aa82d3d5d9b2de27c034329a3
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c b/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
index cef6d2bb972e..a95d12298d93 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/bcmutils.c
@@ -807,16 +807,16 @@ int bcm_ether_atoe(char *p, struct ether_addr *ea)
  * parameter order is like strncpy, but returns count
  * of bytes copied. Minimum bytes copied is null char(1)/wchar(2)
  */
-ulong wchar2ascii(char *abuf, ushort * wbuf, ushort wbuflen, ulong abuflen)
+ulong wchar2ascii(char *abuf, unsigned short * wbuf, unsigned short wbuflen, ulong abuflen)
 {
 	ulong copyct = 1;
-	ushort i;
+	unsigned short i;
 
 	if (abuflen == 0)
 		return 0;
 
 	/* wbuflen is in bytes */
-	wbuflen /= sizeof(ushort);
+	wbuflen /= sizeof(unsigned short);
 
 	for (i = 0; i < wbuflen; ++i) {
 		if (--abuflen == 0)
diff --git a/trunk/drivers/staging/brcm80211/include/bcmutils.h b/trunk/drivers/staging/brcm80211/include/bcmutils.h
index bc8f862f89f4..c1120c0a15f7 100644
--- a/trunk/drivers/staging/brcm80211/include/bcmutils.h
+++ b/trunk/drivers/staging/brcm80211/include/bcmutils.h
@@ -212,7 +212,7 @@ extern "C" {
 	extern char *BCMROMFN(bcmstrcat) (char *dest, const char *src);
 	extern char *BCMROMFN(bcmstrncat) (char *dest, const char *src,
 					   uint size);
-	extern ulong wchar2ascii(char *abuf, ushort *wbuf, ushort wbuflen,
+	extern ulong wchar2ascii(char *abuf, unsigned short *wbuf, unsigned short wbuflen,
 				 ulong abuflen);
 	char *bcmstrtok(char **string, const char *delimiters, char *tokdelim);
 	int bcmstricmp(const char *s1, const char *s2);
diff --git a/trunk/drivers/staging/brcm80211/include/typedefs.h b/trunk/drivers/staging/brcm80211/include/typedefs.h
index 07b5207a8636..911d134af36c 100644
--- a/trunk/drivers/staging/brcm80211/include/typedefs.h
+++ b/trunk/drivers/staging/brcm80211/include/typedefs.h
@@ -31,7 +31,6 @@ typedef unsigned long long int uintptr;
 #endif
 
 #define TYPEDEF_UINT
-#define TYPEDEF_USHORT
 #define TYPEDEF_ULONG
 
 /*
@@ -40,10 +39,6 @@ typedef unsigned long long int uintptr;
 
 /* define ushort, uint, ulong */
 
-#ifndef TYPEDEF_USHORT
-typedef unsigned short ushort;
-#endif
-
 #ifndef TYPEDEF_UINT
 typedef unsigned int uint;
 #endif
@@ -94,7 +89,6 @@ typedef signed int int32;
 
 #define	AUTO	(-1)		/* Auto = -1 */
 
-#undef TYPEDEF_USHORT
 #undef TYPEDEF_UINT
 #undef TYPEDEF_ULONG
 #undef TYPEDEF_UINT16
diff --git a/trunk/drivers/staging/brcm80211/include/wlioctl.h b/trunk/drivers/staging/brcm80211/include/wlioctl.h
index 955662d6fd4d..8216fe2b177b 100644
--- a/trunk/drivers/staging/brcm80211/include/wlioctl.h
+++ b/trunk/drivers/staging/brcm80211/include/wlioctl.h
@@ -566,8 +566,8 @@ typedef struct wl_wsec_key {
 
 /* receptacle for WLC_SET_WSEC_PMK parameter */
 typedef struct {
-	ushort key_len;		/* octets in key material */
-	ushort flags;		/* key handling qualification */
+	unsigned short key_len;		/* octets in key material */
+	unsigned short flags;		/* key handling qualification */
 	u8 key[WSEC_MAX_PSK_LEN];	/* PMK material */
 } wsec_pmk_t;