Commit graph

284 commits

Author SHA1 Message Date
Roland Vossen 6cdeaef203 staging: brcm80211: replaced typedef wl_if_t by struct wl_if
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08 14:27:48 -08:00
Roland Vossen d65ddb5832 staging: brcm80211: replaced typedef bmac_pmq_t by struct bmac_pmq
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08 14:27:47 -08:00
Roland Vossen 299f8a4658 staging: brcm80211: replaced typedef antsel_info_t by struct antsel_info
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08 14:27:47 -08:00
Roland Vossen 0e49347489 staging: brcm80211: replaced typedef wlc_ap_info_t by struct wlc_ap_info
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08 14:27:47 -08:00
Roland Vossen 1f2fd4531d staging: brcm80211: replaced typedef ampdu_info_t by struct ampdu_info
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08 14:27:47 -08:00
Roland Vossen 4dc79de1e3 staging: brcm80211: replaced typedef wlc_if_t by struct wlc_if
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08 14:27:47 -08:00
Roland Vossen 41224eb2df staging: brcm80211: removed unused macro's and typedefs from wpa.h
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08 14:27:46 -08:00
Roland Vossen 0dedc37070 staging: brcm80211: removed unused typedefs
Code cleanup.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-08 14:27:46 -08:00
Greg Kroah-Hartman ea3398a1ae Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly.  It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-07 10:47:56 -08:00
Roland Vossen e304151f15 staging: brcm80211: replaced wlc_hw_info_t by struct wlc_hw_info
Part of code cleanup effort.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:08:44 -08:00
Arend van Spriel 8538576474 staging: brcm80211: remove macro usage for sk_buff release
PKTFREE macro calls osl_pktfree. This function has been renamed to
pkt_buf_free_skb as it comprises of functionality additional to
dev_kfree_skb(_any) function and to get rid of the OSL concept in
this driver.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Dowan Kim <dowan@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:08:31 -08:00
Arend van Spriel f09e02322e staging: brcm80211: remove macro usage for sk_buff allocation
PKTGET macro calls osl_pktget. This function has been renamed to
pkt_buf_get_skb as it comprises of functionality additional to
dev_alloc_skb function and to get rid of the OSL concept in this driver.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Reviewed-by: Dowan Kim <dowan@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:08:30 -08:00
Roland Vossen c6a9e1fc71 staging: brcm80211: replaced wlc_info_t by struct wlc_info.
Part of code cleanup effort. Global replace of wlc_info_t with struct wlc_info.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:07:57 -08:00
Brett Rudley e63449b717 staging: brcm80211: Removing cruft from osl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:07:33 -08:00
Brett Rudley 326a67977c staging: brcm80211: migrate register ops macros to bcmutils.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:07:33 -08:00
Brett Rudley 8968af14f8 staging: brcm80211: move dma specific macros from osl to dma code
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:07:33 -08:00
Brett Rudley 411ee44ad3 staging: brcm80211: move fullmac-only code from osl to fullmac files
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:07:10 -08:00
Brett Rudley ec79570496 staging: brcm80211: Remove unused softmac macros
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:07:09 -08:00
Brett Rudley 7a9b48b3d3 staging: brcm80211: Move osl_pub into osl
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:07:09 -08:00
Brett Rudley 98ede2ed46 staging: brcm80211: OSLREGOPS is unused, remove checks for it.
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-06 16:07:08 -08:00
Roland Vossen 3d44661ad1 staging: brcm80211: added firmware validation
Fix for https://bugzilla.kernel.org/show_bug.cgi?id=21872

New function wl_check_firmwares() checks validity of all firmware images
loaded from user space.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-03 12:27:01 -08:00
Arend van Spriel ff29ee8f93 staging: brcm80211: remove redundant CHIPREV macro
The CHIPREV macro simply expands to the macro argument so it is
redundant and as such removed.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-02 12:34:09 -08:00
Arend van Spriel dfa2643610 staging: brcm80211: remove redundant CHIPID macro
The CHIPID macro simply expands to the macro argument so it is
redundant and as such removed.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-02 12:34:09 -08:00
Arend van Spriel 92246bcbd7 staging: brcm80211: remove redundant CHIPTYPE macro
The CHIPTYPE macro simply expands to the macro argument so it is
redundant and as such removed.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-02 12:34:08 -08:00
Brett Rudley c523ea78ec staging: brcm80211: absorb linux_osl.h into osl.h
Move code from linux_osl.h into osl.h and delete linux_osl.h, which
created a bunch of checkpatch errors...
I fixed most but volatile warnings will have to be dealt with later.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-02 12:28:48 -08:00
Brett Rudley df880a42dc staging: brcm80211: Remove unused code from osl.h
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-02 12:28:48 -08:00
Roland Vossen 2cb22a7a56 staging: brcm80211: replaced typedef struct wl_info_t by struct wl_info.
Part of the code cleanup effort. CodingStyle doc advises to restrict the usage
of typedefs. Also moved several function declarations from .c to .h file
because this typedef replace operation induced checkpatch.pl warnings.

Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-01 14:58:20 -08:00
Randy Dunlap 01d11441fd staging: brcm80211 needs lots of delay.h
Fix lots of errors like:

drivers/staging/brcm80211/phy/wlc_phy_n.c:17613: error: implicit declaration of function 'mdelay'
drivers/staging/brcm80211/util/nicpci.c:246: error: implicit declaration of function 'udelay'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Dowan Kim <dowan@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Cc: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-01 14:58:19 -08:00
Brett Rudley a043b26646 staging: brcm80211: bcmp => memcmp
s/bcmp/memcmp/

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-01 14:58:19 -08:00
Brett Rudley 9249ede9d4 staging: brcm80211: bzero => memset
s/bzero/memset/g

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-01 14:55:52 -08:00
Brett Rudley c10407ac45 staging: brcm80211: remove OSL_SYSUPTIME_SUPPORT
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-01 14:55:52 -08:00
Brett Rudley c53d201371 staging: brcm80211: Remove bogus gcc version checking
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-01 14:55:51 -08:00
Brett Rudley f5343314f6 staging: brcm80211: Remove unused PKTFREESETCB
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-01 14:55:51 -08:00
Brett Rudley 954c7a6c96 staging: brcm80211: Remove OSL_DMADDRWIDTH
Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-12-01 14:55:50 -08:00
Brett Rudley fa7a1db200 staging: brcm80211: Remove BUSTYPE macro
BUSTYPE isn't used in this configuration.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:37:51 -08:00
Arend van Spriel c95e66e1fa staging: brcm80211: remove unused dhd_ops_virt variable definition
The variable dhd_ops_virt was used before although its use was rather
limited as can be found in previous commit:

| commit 4fd68ae1a5
| Author: Julia Lawall <julia@diku.dk>
| Date:   Tue Oct 26 12:25:33 2010 +0200
|
|    drivers/staging/brcm80211/brcmfmac/dhd_linux.c: delete double assignment
|

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:37:33 -08:00
Arend van Spriel 3be727c8f0 staging: brcm80211: remove some more packet related macros
macros PKTHEADROOM and PKTTAILROOM have been replaced by native
skbuff functions and macros PKTALLOCED and PKTUNALLOC have been
removed.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:37:32 -08:00
Arend van Spriel 54991ad6d0 staging: brcm80211: removed packet macros for accessing sk_buff fields
With the packet storage type changed from void pointer to struct sk_buff
pointer there is no need for macros for accessing these fields through
casting. These can now be accessed directly.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:37:01 -08:00
Arend van Spriel c26b1378a7 staging: brcm80211: change packet buffer type to native struct sk_buff
The packet queues now store struct sk_buff pointer and subsequently
all driver code handling packets now use struct sk_buff as package
storage type. Next step will be getting rid of packet macros.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:37:01 -08:00
Arend van Spriel b6eb5c0f71 staging: brcm80211: remove unneccessary packets funtion prototype
The prototype for function pktsegcnt in bmcutils.h is not defined
nor used anywhere in the driver so it can be removed.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:37:01 -08:00
Arend van Spriel 7c8bc0147f staging: brcm80211: add include file for using semaphore related definitions
Source wl_iw.c uses semaphore definitions and as such should include
<linux/semaphore.h>.

Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:36:34 -08:00
Brett Rudley 57d8cd23c2 staging: brcm80211: OSL shrink: Remove OSL_PCI_READ/WRITE_CONFIG
Replace OSL layer PCI READ/WRITE macros with native calls.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 11:36:34 -08:00
Huang Weiyi 95bd48578b staging: brcm80211: remove duplicated #include
Remove duplicated #include('s) in
  drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 10:59:50 -08:00
Arend van Spriel 6df78338e7 staging: brcm80211: updated maintainers contact information
Open-source development team extended so contacts updated.

Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-29 10:53:14 -08:00
Brett Rudley 861f670318 staging: brcm80211: stragglers not handled by unifdef
Part of BMAC removal.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-19 17:09:13 -08:00
Brett Rudley f9ec972793 staging: brcm80211: unifdef -UBCMSDIO
Part of BMAC removal.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-19 17:09:05 -08:00
Brett Rudley c73b9d6759 staging: brcm80211: remove bmac-only header files
Part of BMAC removal.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-19 17:09:04 -08:00
Brett Rudley f3ce1ef2f8 staging: brcm80211: unifdef -UWLC_SPLIT
Part of BMAC removal.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-19 17:09:04 -08:00
Brett Rudley 501c09346c staging: brcm80211: unifdef -DWLC_LOW
Part of BMAC removal.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-19 17:09:04 -08:00
Brett Rudley 02db6b4769 staging: brcm80211: unifdef -UWLC_LOW_ONLY
Part of BMAC removal.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-19 17:09:03 -08:00