Commit graph

169 commits

Author SHA1 Message Date
Greg Kroah-Hartman
0965ae88af Staging: brcm80211: remove FALSE #define
use the kernel provided 'false' value instead, especially
as we are using a 'bool' for these variables.

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>
2010-10-12 12:50:15 -07:00
Greg Kroah-Hartman
0f0881b090 Staging: brcm80211: remove TRUE #define
use the kernel provided 'true' value instead, especially
as we are using a 'bool' for these variables.

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>
2010-10-12 12:15:18 -07:00
Andy Shevchenko
ba07d0cbc9 staging: brcm80211: remove useless bcm_ether_ntoa()
Since we have '%pM' modifier in the kernel's *printf() we don't need to
convert address to the string beforehand.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: Nohee Ko <noheek@broadcom.com>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Cc: linux-wireless@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-12 09:03:29 -07:00
nohee ko
88b3eaa499 staging: brcm80211: remove duplicated function, wf_channel2mhz
remove duplicated function, wf_channel2mhz

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-12 09:03:28 -07:00
Jason Cooper
a9d0fffa93 staging: brcm80211: remove BCMNMIATTACHFN() macro.
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-12 08:52:29 -07:00
Jason Cooper
9927fc2eab staging: brcm80211: remove BCMUNINITFN() macro.
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-12 08:52:28 -07:00
Jason Cooper
b4f790eeb3 staging: brcm80211: remove BCMINITFN() macro.
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-12 08:52:28 -07:00
Jason Cooper
2184ccb9f7 staging: brcm80211: remove BCMINITDATA() macro.
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-12 08:52:13 -07:00
Jason Cooper
eeb8e46b50 staging: brcm80211: fix various checkpatch errors.
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-12 08:51:55 -07:00
Jason Cooper
94dc5e7780 staging: brcm80211: s/unsigned char/size_t/ for min_t()
Avoid potential truncation.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-11 15:06:43 -07:00
Andy Shevchenko
d5642d3ba7 staging: brcm80211: remove custom string library again
There was a clean up commit for softmac driver. Do the same for fullmac
implementation.

Here:
 - strtoul and bcm_strtoul are changed to simple_strtoul
 - bcmstrtok -> strsep

All unused functions are deleted.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-11 15:02:30 -07:00
Andy Shevchenko
41c7f4167e staging: brcm80211: clean up custom ctype library again
The similar cleanup was done before for softmac implementation.  But the
fullmac driver brings this back. Remove it again.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-11 15:02:29 -07:00
Jason Cooper
53e974db65 staging: brcm80211: fix 'comparison..cast' compiler warnings.
Use min_t() macro instead of min().

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-10 11:24:59 -07:00
Greg Kroah-Hartman
a6cf450e02 Staging: brcm80211: remove __cplusplus markers
It's not needed within the kernel, so remove them.

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>
2010-10-10 05:52:59 -07:00
Jason Cooper
22b564b0b6 staging: brcm80211: remove BLOCKABLE so no one uses it.
BLOCKABLE() doesn't do what it's supposed to.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-10 05:39:51 -07:00
Jason Cooper
7716314bf9 staging: brcm80211: remove kernel_thread() for wl_iscan_thread and wl_event_thread.
Replace kernel_thread() with kthread_run().  Replace pid with tsk,
and exited with kthread_stop()/kthread_should_stop().

event_tsk, and tsk are NULL when their respective threads are not running.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-10 05:39:51 -07:00
Jason Cooper
5e2773ea93 staging: brcm80211: remove kernel_thread() for _iscan_sysioc_thread.
Replace kernel_thread() with kthread_run, kthread_stop() and
kthread_should_stop().  Remove sysioc_pid, sysioc_exit, and DAEMONIZE.

sysioc_tsk is NULL when not running.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-10 05:39:50 -07:00
Jason Cooper
d809dcb9df staging: brcm80211: remove kernel_thread() for _dhd_sysioc_thread.
Replaced kernel_thread() with kthread_run(), kthread_stop(), and
kthread_should_stop().  Also removed all references to sysioc_pid and
sysioc_exit.  DAEMONIZE removed because not used in dhd_linux.c.

sysioc_tsk is NULL when not running.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-10 05:39:49 -07:00
Jason Cooper
ecd7559d8d staging: brcm80211: remove kernel_thread() for dhd_dpc_thread.
use kthread_run(), kthread_stop(), and kthread_should_stop().  Removes
dpc_pid, dpc_exited, and the call to DAEMONIZE.

dpc_tsk is NULL when not running.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-10 05:39:48 -07:00
Jason Cooper
860708d9c8 staging: brcm80211: remove kernel_thread() for dhd_watchdog_thread.
Replaced kernel_thread() with kthread_run().  Used kthread_should_stop()
in place of watchdog_exited completion.  Replaced watchdog_pid with
struct task_struct.

watchdog_tsk is NULL when the task is not running.

Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-10 05:39:47 -07:00
nohee ko
839fad996b staging: brcm80211: remove unnecessary cflag, LINUX
remove unnecessary cflag, LINUX

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-09 13:49:43 -07:00
nohee ko
1e8dd5b9b3 staging: brcm80211: remove unnecessary cflag, CONFIG_CFG80211
remove unnecessary cflag, CONFIG_CFG80211

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-09 13:49:42 -07:00
nohee ko
5e33a02ff7 staging: brcm80211: remove unnecessary cflag, BCMWPA2
remove unnecessary cflag, BCMWPA2.
BCMDRIVER is already not used.

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-09 13:49:42 -07:00
nohee ko
ea3b8a2810 staging: brcm80211: remove duplicated file, bcmutils.c
Remove duplicated file, bcmutils.c under brcm80211/brcmfmac.
brcm80211/util/bcmutils.c will be shared between softmac
& fullmac. Makefile, and some other files are also modified
accordingly

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-09 13:49:41 -07:00
Dan Carpenter
cbf6baac77 Staging: brcm80211: make interface name buffer smaller
In the original code the interface name was IFNAMSIZ + 1, but that
caused problems in dhd_ifname2idx() which does:
	strncmp(dhd->iflist[i]->name, name, IFNAMSIZ)

The wl_event_msg_t struct can only store 16 character names as well.

And thirdly there is a potential buffer overflow in dhd_op_if() because
if->net->name is IFNAMSIZ and we do:
	strcpy(ifp->net->name, ifp->name);

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-09 13:49:40 -07:00
Brett Rudley
edae01b94a staging: brcm80211: Purge unused wlc_id_name
Purge unused wlc_id_name_entry

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-08 19:53:11 -07:00
Brett Rudley
a9a6073c51 staging: brcm80211: Purge unused packet engine
We're not using the packet engine anymore - goodbye.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-08 19:53:10 -07:00
nohee ko
fb693a712c staging: brcm80211: bug fix- dual band problem
Bug fix for dual band problem. In particular it had an issue
to connect to 5G band AP.

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-08 19:53:10 -07:00
Brett Rudley
40e5c96b22 staging: brcm80211: Coalesce osl_dma_alloc_consistent between fullmac and softmac
Combine dma_alloc routine for full and softmac

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-08 14:32:52 -07:00
Brett Rudley
17b313857d staging: brcm80211: Purge unused memlist debugging
Purge unused memlist debugging

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-08 14:29:43 -07:00
Greg Kroah-Hartman
0d2f0724a4 Staging: brcm80211: remove BCMATTACHFN macro
It's not doing anything and is a bit silly.

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>
2010-10-08 14:28:21 -07:00
Greg Kroah-Hartman
17c4da1ecf Staging: brcm80211: remove BCMATTACHDATA macro
It's not even used for anything, not to mention, it is pretty silly.

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>
2010-10-08 14:11:20 -07:00
Greg Kroah-Hartman
b61640d1ac Staging: brcm80211: brcmfmac: fix some comparison warnings
Use min_t() instead of min() in some places to make the
comparison explicit and resolve some compiler warnings.

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>
2010-10-08 12:37:39 -07:00
Greg Kroah-Hartman
a300ce95e4 Staging: brcm80211: sys: fix some comparison warnings
Use min_t() instead of min() in some places to make the
comparison explicit and resolve some compiler warnings.

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>
2010-10-08 12:28:02 -07:00
Greg Kroah-Hartman
697d600d8f Staging: brcm80211: sys: wlc_ampdu: fix some comparison warnings
Use min_t() instead of min() in some places to make the comparison
explicit and resolve some compiler warnings.

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>
2010-10-08 12:25:23 -07:00
Greg Kroah-Hartman
e9e6727fcc Staging: brcm80211: phy: wlc_phy_n: fix some comparison warnings
Use min_t() instead of min() in some places to make the comparison
explicit and resolve some compiler warnings.

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.d
2010-10-08 12:16:08 -07:00
Greg Kroah-Hartman
c09cc58692 Staging: brcm80211: hnddma.c: fix compiler warning
Change the field types of dma_info_t to make comparing values easier
(and correct.)  No need to keep rxbufsize as a u16, it can be an
unsigned int to make things easier.

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>
2010-10-08 12:07:33 -07:00
Greg Kroah-Hartman
96e76e6941 Staging: brcm80211: remove VALID_MASK macro
No one is using it.

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>
2010-10-08 12:01:30 -07:00
Greg Kroah-Hartman
e18d5313c6 Staging: brcm80211: remove ROUNDUP macro
And use the kernel provided 'roundup' instead.

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>
2010-10-08 11:59:06 -07:00
Greg Kroah-Hartman
36c63ff6af Staging: brcm80211: remove ISALIGNED macro
And use the kernel provided IS_ALIGNED one instead.

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>
2010-10-08 11:55:40 -07:00
Greg Kroah-Hartman
d2733c97fa Staging: brcm80211: remove unused ALIGN_ADDR() macro
It's not used (and there's a kernel provided one if it's ever needed in
the future), so remove it.

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>
2010-10-08 11:52:16 -07:00
Greg Kroah-Hartman
8d3d6a6945 Staging: brcm80211: remove ARRAYSIZE macro
Use the real 'ARRAY_SIZE' definition instead.

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>
2010-10-08 11:47:11 -07:00
Greg Kroah-Hartman
ce0f1b8cd1 Staging: brcm80211: remove OFFSETOF macro
Use the real 'offsetof' definition instead.

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>
2010-10-08 11:44:45 -07:00
Greg Kroah-Hartman
3ea2f4d640 Staging: brcm80211: remove broken MAX() implementation
Use the kernel-provided version, this one is broken.

Note, there are more compiler warnings now, that's due to different
types being compared, which shows how the original macro was wrong in at
least one way.  They need to be fixed up.

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>
2010-10-08 11:39:43 -07:00
Greg Kroah-Hartman
7068c2f139 Staging: brcm80211: remove broken MIN() implementation
Use the kernel-provided version, this one is broken.

Note, there are more compiler warnings now, that's due to different
types being compared, which shows how the original macro was wrong in at
least one way.  They need to be fixed up.

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>
2010-10-08 11:34:59 -07:00
Greg Kroah-Hartman
c03b63c198 Staging: brcm80211: util: remove unneeded usage of uintptr
Double casting is pretty pointless, don't do that.

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>
2010-10-08 11:20:01 -07:00
Greg Kroah-Hartman
f1d0fe0abc Staging: brcm80211: remove unused typedefs in typedefs.h
uint is already defined somewhere else, so just remove this version
of it.

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>
2010-10-08 11:13:11 -07:00
Greg Kroah-Hartman
3e26416e2f Staging: brcm80211: s/int32/s32/
Use the kernel types, don't invent your own.

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>
2010-10-08 11:11:13 -07:00
Greg Kroah-Hartman
66cbd3ab35 Staging: brcm80211: s/uint32/u32/
Use the kernel types, don't invent your own.

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>
2010-10-08 11:05:47 -07:00
Brett Rudley
588abaa64b staging: brcm80211: Use proper BRCM_FULLMAC #ifdefs
Make it obvious that DHD_USE_STATIC_BUF is only used as part of FULLMAC build

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-07 21:14:23 -07:00