Commit graph

202 commits

Author SHA1 Message Date
Ben Hutchings
34a488c1e0 Staging: Update parameters for cfg80211 key management operation
Commit e31b82136d ("cfg80211/mac80211:
allow per-station GTKs") changed the signatures of these operations
but did not update the staging drivers.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-09 16:49:33 -08:00
Brett Rudley
0d58fef68c staging: brcm80211: Maintainer change
Nohee => Dowan

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-09 14:05:23 -08:00
Julia Lawall
4fd68ae1a5 drivers/staging/brcm80211/brcmfmac/dhd_linux.c: delete double assignment
Delete successive assignments to the same location.  dhd_ops_virt contains
a subset of the definitions of dhd_ops_pri.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression i;
@@

*i = ...;
 i = ...;
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-11-09 14:05:22 -08:00
Thomas Gleixner
45f4d02435 staging: Final semaphore cleanup
Fixup the last remaining users of DECLARE_MUTEX and init_MUTEX.

Scripted conversion, resulting code is binary equivalent.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Greg Kroah-Hartman <gregkh@suse.de>
LKML-Reference: <20100907125057.278833764@linutronix.de>
2010-10-30 12:12:50 +02:00
Greg Kroah-Hartman
5af634789c Staging: brcm80211: fix usage of roundup in structures
Now that the roundup macro is sane, it can't be used in structure
definitions, or the build breaks..  For now, create a "broken_roundup()"
macro to get everything building again, but in the end, fixing these
structures to use a proper size value is the correct thing to do.

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-28 09:55:53 -07:00
Henry Ptasinski
a4ac0d847a staging: brcm80211: brcmfmac: Removed codeversion from firmware filenames.
The basename-apiversion-codeversion construction for firmware filenames is not
used by most other firmware files, adds complexity, and is not providing any
value.  Rename the firmware files using just basename-apiversion.

Users of the brcmfmac driver will need to update the linux-firmware package
to get the renamed files, or manually rename their installed firmware files.

Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-21 11:43:49 -07:00
Henry Ptasinski
0a00bc2019 staging: brcm80211: Remove unnecessary header files.
These header files are no longer needed.

Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-21 11:30:00 -07:00
Henry Ptasinski
30e4352349 staging: brcm80211: Remove unnecessary includes from bcmutils.c
Removed includ of bcmip.h and vlan.h, as they're no longer needed.

Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-21 11:28:40 -07:00
Henry Ptasinski
ab3275a6b5 staging: brcm80211: Removed unnecessary pktsetprio() function.
This function is completely unnecessary, as packet classification is done
higher up in the stack.  As used, the function actually mis-classifies frames
in some cases since it overwrites the classification done by the stack.

Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-21 11:28:04 -07:00
Greg Kroah-Hartman
a1c16ed266 Staging: brcm80211: remove typedefs.h
It's not needed anymore, so remove it and clean up the .h inclusion mess
a bit to get everything to build properly again.

Wow, this needs some unwinding...

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-21 11:17:44 -07:00
Greg Kroah-Hartman
f024c48a77 Staging: brcm80211: remove uintptr typedef usage
Use a unsigned long, that is the proper type for this type of thing on
Linux.

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-21 10:50:21 -07:00
nohee ko
cd389a34a1 staging: brcm80211: brcmfmac: add debugfs, display wi-fi statistics
Add debugfs to display wi-fi profile/statistics.
Initially some profile parameters such as dtim_period,
beacon_int will be seen at
/sys/kernel/debug/ieee80211/phy#/netdev:eth#.
This will provide users with current connection status.

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-19 10:54:52 -07:00
nohee ko
1e0645c323 staging: brcm80211: brcmfmac: add profile, beacon_int, dtim_period
Add profile, beacon_int & dtim_period.
This profile can be seen through debugfs.

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-19 10:54:52 -07:00
nohee ko
c5ca038fa5 staging: brcm80211: brcmfmac: enable passive, active scan selection
Enable passive, active scan selection.
Previously it did active scan and reported
probe response result regardless of active_scan
flag

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-19 10:54:51 -07:00
nohee ko
f49200c367 staging: brcm80211: brcmfmac: remove unnecessary cflags, WL_ISCAN_DISABLED & WL_ROAM_DISABLED
Remove unnecessary cflags, WL_ISCAN_DISABLED
and WL_ROAM_DISABLED. Iscan is ON and Roam by FW
is OFF by default.

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-19 10:54:51 -07:00
mike.rapoport@gmail.com
da6830ac39 staging: brcm80211: remove unrefrenced malloced field
from 'struct osl_info' structure

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:30:01 -07:00
mike.rapoport@gmail.com
182acb3ca5 staging: brcm80211: replace MFREE with kfree
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:29:56 -07:00
mike.rapoport@gmail.com
199d217c52 staging: brcm80211: remove unused NATIVE_{MALLOC,MFREE}
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:29:22 -07:00
mike.rapoport@gmail.com
5fcc1fcb2e staging: brcm80211: replace MALLOC() with k[zm]alloc
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:28:58 -07:00
mike.rapoport@gmail.com
97e17d0e7b staging: brcm80211: remove osl_malloced()/MALLOCED()
because there are other means to track memory leaks in kernel

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:28:18 -07:00
mike.rapoport@gmail.com
6a92fdf1b9 staging: brcm80211: remove DHD_USE_STATIC_BUF
The DHD_USE_STATIC_BUF cannot be enabled in the build configuration,
remove it.

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:27:50 -07:00
Greg Kroah-Hartman
6ddcfdcf91 Staging: brcm80211: fix up compiler warnings I created
I messed up on some of the uintptr conversions, this fixes them up
properly.

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-14 12:26:08 -07:00
mike.rapoport@gmail.com
7383141b03 staging: brcm80211: remove OSL_DELAY
and use udelay and mdelay instead

Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:24:35 -07:00
nohee ko
5dc56c9f4c staging: brcm80211: brcmfmac: bug fix - scan result report
Scan result was reported with some duplicated information.
Those were about SSID/ rate. With this patch, the duplication
can be erased.

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:21:53 -07:00
nohee ko
7356f429d2 staging: brcm80211: brcmfmac: replace KILL_PROC with send_sig()
logic optimization : replace KILL_PROC with send_sig()

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:21:52 -07:00
Brett Rudley
4c71ebf4da staging: brcm80211: Purge unused bcmwpa.[ch]
Move two macros into wlc_mac80211.h and purge the rest.

Signed-off-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-14 12:20:49 -07:00
nohee ko
af73713642 staging: brcm80211: bug fix- rmmod hang problem
Bug fix - rmmod hang problem.
Can keep both of kthread & down_interruptible.
And in the meantime, can terminate the threads
properly during rmmod process.

Signed-off-by: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-10-12 14:07:45 -07:00
Greg Kroah-Hartman
c11b0ef8fe Staging: brcm80211: remove sbpciregs_t typedef
don't use a typedef, use a 'struct'.

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 14:04:26 -07:00
Greg Kroah-Hartman
3c2c926823 Staging: brcm80211: util: remove unneeded use of uintptr
uintptr shouldn't be used when you are just casting to a pointer anyway,
so remove it from these usages.

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 13:20:38 -07:00
Greg Kroah-Hartman
e88cf8eb62 Staging: brcm80211: sys: remove unneeded use of uintptr
uintptr shouldn't be used when you are just casting to a pointer anyway,
so remove it from these usages.

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 13:20:19 -07:00
Greg Kroah-Hartman
159a3b78f9 Staging: brcm80211: phy: remove unneeded use of uintptr
uintptr shouldn't be used when you are just casting to a pointer anyway,
so remove it from these usages.

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 13:20:00 -07:00
Greg Kroah-Hartman
3acf41c5c9 Staging: brcm80211: include: remove unneeded use of uintptr
uintptr shouldn't be used when you are just casting to a pointer anyway,
so remove it from these usages.

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 13:18:17 -07:00
Greg Kroah-Hartman
ec1284e104 Staging: brcm80211: bcmsdpcm: remove a bunch of unused macros
These direct memory reading macros are not being used, 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-12 13:04:58 -07:00
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