FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 05:11:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: brcm80211: smac: fix for 64 bit systems

Browse Source 
A bug was introduced by the following commit (Sep 13):

    staging: brcm80211: use endian annotated structures in brcmsmac

Result was that 64 bits systems will not be able to acquire an IP address.
Also the rmmod crashed. This has been fixed and retested on a Sparc64.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Roland Vossen 2011-10-04 23:19:12 +02:00 committed by Greg Kroah-Hartman
parent 8be00d98f1
commit d0f5527d39
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
View File

@ -1606,7 +1606,7 @@ fail:
* Precondition: Since this function is called in brcms_pci_probe() context, * Precondition: Since this function is called in brcms_pci_probe() context,
* no locking is required. * no locking is required.
*/ */
int brcms_ucode_init_uint(struct brcms_info *wl, u32 *data, u32 idx) int brcms_ucode_init_uint(struct brcms_info *wl, size_t *n_bytes, u32 idx)
{ {
int i, entry; int i, entry;
const u8 *pdata; const u8 *pdata;
@ -1623,7 +1623,7 @@ int brcms_ucode_init_uint(struct brcms_info *wl, u32 *data, u32 idx)
"ERROR: fw hdr len\n"); "ERROR: fw hdr len\n");
return -ENOMSG; return -ENOMSG;
} }
*data = le32_to_cpu(*((__le32 *) pdata)); *n_bytes = le32_to_cpu(*((__le32 *) pdata));
return 0; return 0;
} }
} }

4
drivers/staging/brcm80211/brcmsmac/ucode_loader.h
View File

@ -50,8 +50,8 @@ extern void brcms_ucode_data_free(struct brcms_ucode *ucode);
extern int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf, extern int brcms_ucode_init_buf(struct brcms_info *wl, void **pbuf,
unsigned int idx); unsigned int idx);
extern int brcms_ucode_init_uint(struct brcms_info *wl, unsigned *data, extern int brcms_ucode_init_uint(struct brcms_info *wl, size_t *n_bytes,
unsigned int idx); unsigned int idx);
extern void brcms_ucode_free_buf(void *); extern void brcms_ucode_free_buf(void *);
extern int brcms_check_firmwares(struct brcms_info *wl); extern int brcms_check_firmwares(struct brcms_info *wl);