Skip to content

Commit

Permalink
Staging: brcm80211: fix usage of roundup in structures
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Oct 28, 2010
1 parent eebfc60 commit 5af6347
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/brcm80211/sys/wlc_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
};

/*
Expand Down
3 changes: 2 additions & 1 deletion drivers/staging/brcm80211/sys/wlc_key.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 5af6347

Please sign in to comment.