diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-18 23:38:50 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-03-18 23:38:50 -0700 |
| commit | 97eb3f24352ec6632c2127b35d8087d2a809a9b9 (patch) | |
| tree | 722948059bbd325bbca232269490124231df80d4 /drivers/staging/brcm80211/sys/wlc_rate.c | |
| parent | 439581ec07fa9cf3f519dd461a2cf41cfd3adcb4 (diff) | |
| parent | def179c271ac9b5020deca798470521f14d11edd (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/staging/brcm80211/sys/wlc_rate.c')
| -rw-r--r-- | drivers/staging/brcm80211/sys/wlc_rate.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_rate.c b/drivers/staging/brcm80211/sys/wlc_rate.c index d2d72568756..ab7d0bed3c0 100644 --- a/drivers/staging/brcm80211/sys/wlc_rate.c +++ b/drivers/staging/brcm80211/sys/wlc_rate.c @@ -17,12 +17,14 @@ #include <bcmdefs.h> #include <wlc_cfg.h> #include <osl.h> -#include <linuxver.h> +#include <linux/module.h> #include <bcmutils.h> #include <siutils.h> #include <bcmendian.h> #include <wlioctl.h> +#include <sbhndpio.h> +#include <sbhnddma.h> #include <proto/802.11.h> #include <d11.h> #include <wlc_rate.h> @@ -297,7 +299,7 @@ wlc_rate_hwrs_filter_sort_validate(wlc_rateset_t *rs, uint count; uint i; - bzero(rateset, sizeof(rateset)); + memset(rateset, 0, sizeof(rateset)); count = rs->count; for (i = 0; i < count; i++) { |