diff options
| author | Joe Perches <joe@perches.com> | 2013-12-18 16:52:17 -0800 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-12-19 09:18:03 +0100 |
| commit | 5fe2bb8688cad3608f9fe0d0875f9f6ff776ba51 (patch) | |
| tree | d4eef507df75d6363758340f854e19da512c909a | |
| parent | 367bbd10ee1abe986a6cfec11974d6c32a04bd96 (diff) | |
| download | linux-5fe2bb8688cad3608f9fe0d0875f9f6ff776ba51.tar.bz2 | |
mac80211: align struct ps_data.tim to unsigned long
Its address is used as an unsigned long *, so make sure
that the tim u8 array is properly aligned.
Signed-off-by: Joe Perches <joe@perches.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index c56009c3589d..7785afbd222d 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -246,7 +246,8 @@ struct ps_data { /* yes, this looks ugly, but guarantees that we can later use * bitmap_empty :) * NB: don't touch this bitmap, use sta_info_{set,clear}_tim_bit */ - u8 tim[sizeof(unsigned long) * BITS_TO_LONGS(IEEE80211_MAX_AID + 1)]; + u8 tim[sizeof(unsigned long) * BITS_TO_LONGS(IEEE80211_MAX_AID + 1)] + __aligned(__alignof__(unsigned long)); struct sk_buff_head bc_buf; atomic_t num_sta_ps; /* number of stations in PS mode */ int dtim_count; |