aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-28 09:55:53 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-28 09:55:53 -0700
commit5af634789c93b97cfb314a102436716be8fbc577 (patch)
tree17653cb8bffd2f72d20f046b852f11dcd012c7e9 /drivers/staging
parenteebfc6055aba312f8b620a58fe1c23471cdcd149 (diff)
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/brcm80211/sys/wlc_event.c2
-rw-r--r--drivers/staging/brcm80211/sys/wlc_key.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_event.c b/drivers/staging/brcm80211/sys/wlc_event.c
index 7c17e5f67c5..7e1bf0e2ecd 100644
--- a/drivers/staging/brcm80211/sys/wlc_event.c
+++ b/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/drivers/staging/brcm80211/sys/wlc_key.h b/drivers/staging/brcm80211/sys/wlc_key.h
index d4f1b91f4de..6678c69f1e1 100644
--- a/drivers/staging/brcm80211/sys/wlc_key.h
+++ b/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 */