From 2ff65d669c19a60bda18a5a9226ce90f69d3586c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 28 Oct 2010 09:55:53 -0700 Subject: [PATCH] --- yaml --- r: 220451 b: refs/heads/master c: 5af634789c93b97cfb314a102436716be8fbc577 h: refs/heads/master i: 220449: 136d8d6a17a1264f0eba75609498deff17ec63cb 220447: 00061937836a301957e9a14a7a868ca13b5b0ea2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/sys/wlc_event.c | 2 +- trunk/drivers/staging/brcm80211/sys/wlc_key.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ea34507e3f40..068fcd6affa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eebfc6055aba312f8b620a58fe1c23471cdcd149 +refs/heads/master: 5af634789c93b97cfb314a102436716be8fbc577 diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_event.c b/trunk/drivers/staging/brcm80211/sys/wlc_event.c index 7c17e5f67c5f..7e1bf0e2ecdd 100644 --- a/trunk/drivers/staging/brcm80211/sys/wlc_event.c +++ b/trunk/drivers/staging/brcm80211/sys/wlc_event.c @@ -47,7 +47,7 @@ struct wlc_eventq { bool workpending; struct wl_timer *timer; wlc_eventq_cb_t cb; - u8 event_inds_mask[roundup(WLC_E_LAST, NBBY) / NBBY]; + u8 event_inds_mask[broken_roundup(WLC_E_LAST, NBBY) / NBBY]; }; /* diff --git a/trunk/drivers/staging/brcm80211/sys/wlc_key.h b/trunk/drivers/staging/brcm80211/sys/wlc_key.h index d4f1b91f4dee..6678c69f1e1c 100644 --- a/trunk/drivers/staging/brcm80211/sys/wlc_key.h +++ b/trunk/drivers/staging/brcm80211/sys/wlc_key.h @@ -105,8 +105,9 @@ typedef struct wsec_key { } wsec_key_t; +#define broken_roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y)) typedef struct { - u8 vec[roundup(WSEC_MAX_KEYS, NBBY) / NBBY]; /* bitvec of wsec_key indexes */ + u8 vec[broken_roundup(WSEC_MAX_KEYS, NBBY) / NBBY]; /* bitvec of wsec_key indexes */ } wsec_key_vec_t; /* For use with wsec_key_t.flags */