Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5af63478 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent eebfc605

drivers/staging/brcm80211/sys/wlc_event.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

};



/*

drivers/staging/brcm80211/sys/wlc_key.h

+2 −1
Original line number Diff line number Diff line
@@ -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 */