evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: brcm80211: s/ushort/unsigned short/

Browse source 
This changes the usage everywhere in the driver, and removes
the definition as it should no longer be used anywhere.

Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-10-05 11:11:46 -07:00
parent 580a0bd9b7
commit d7e508880b
4 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/brcm80211/brcmfmac/bcmutils.c
View file

@ -807,16 +807,16 @@ int bcm_ether_atoe(char *p, struct ether_addr *ea)
* parameter order is like strncpy, but returns count * parameter order is like strncpy, but returns count
* of bytes copied. Minimum bytes copied is null char(1)/wchar(2) * 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; ulong copyct = 1;
ushort i; unsigned short i;
if (abuflen == 0) if (abuflen == 0)
return 0; return 0;
/* wbuflen is in bytes */ /* wbuflen is in bytes */
wbuflen /= sizeof(ushort); wbuflen /= sizeof(unsigned short);
for (i = 0; i < wbuflen; ++i) { for (i = 0; i < wbuflen; ++i) {
if (--abuflen == 0) if (--abuflen == 0)

2
drivers/staging/brcm80211/include/bcmutils.h
View file

@ -212,7 +212,7 @@ extern "C" {
extern char *BCMROMFN(bcmstrcat) (char *dest, const char *src); extern char *BCMROMFN(bcmstrcat) (char *dest, const char *src);
extern char *BCMROMFN(bcmstrncat) (char *dest, const char *src, extern char *BCMROMFN(bcmstrncat) (char *dest, const char *src,
uint size); uint size);
extern ulong wchar2ascii(char *abuf, ushort *wbuf, ushort wbuflen, extern ulong wchar2ascii(char *abuf, unsigned short *wbuf, unsigned short wbuflen,
ulong abuflen); ulong abuflen);
char *bcmstrtok(char **string, const char *delimiters, char *tokdelim); char *bcmstrtok(char **string, const char *delimiters, char *tokdelim);
int bcmstricmp(const char *s1, const char *s2); int bcmstricmp(const char *s1, const char *s2);

6
drivers/staging/brcm80211/include/typedefs.h
View file

@ -31,7 +31,6 @@ typedef unsigned long long int uintptr;
#endif #endif
#define TYPEDEF_UINT #define TYPEDEF_UINT
#define TYPEDEF_USHORT
#define TYPEDEF_ULONG #define TYPEDEF_ULONG
/* /*
@ -40,10 +39,6 @@ typedef unsigned long long int uintptr;
/* define ushort, uint, ulong */ /* define ushort, uint, ulong */
#ifndef TYPEDEF_USHORT
typedef unsigned short ushort;
#endif
#ifndef TYPEDEF_UINT #ifndef TYPEDEF_UINT
typedef unsigned int uint; typedef unsigned int uint;
#endif #endif
@ -94,7 +89,6 @@ typedef signed int int32;
#define AUTO (-1) /* Auto = -1 */ #define AUTO (-1) /* Auto = -1 */
#undef TYPEDEF_USHORT
#undef TYPEDEF_UINT #undef TYPEDEF_UINT
#undef TYPEDEF_ULONG #undef TYPEDEF_ULONG
#undef TYPEDEF_UINT16 #undef TYPEDEF_UINT16

4
drivers/staging/brcm80211/include/wlioctl.h
View file

@ -566,8 +566,8 @@ typedef struct wl_wsec_key {
/* receptacle for WLC_SET_WSEC_PMK parameter */ /* receptacle for WLC_SET_WSEC_PMK parameter */
typedef struct { typedef struct {
ushort key_len; /* octets in key material */ unsigned short key_len; /* octets in key material */
ushort flags; /* key handling qualification */ unsigned short flags; /* key handling qualification */
u8 key[WSEC_MAX_PSK_LEN]; /* PMK material */ u8 key[WSEC_MAX_PSK_LEN]; /* PMK material */
} wsec_pmk_t; } wsec_pmk_t;