aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-12-18 19:52:17 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-12-19 03:18:03 -0500
commit5fe2bb8688cad3608f9fe0d0875f9f6ff776ba51 (patch)
treed4eef507df75d6363758340f854e19da512c909a /net/mac80211
parent367bbd10ee1abe986a6cfec11974d6c32a04bd96 (diff)
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/ieee80211_i.h3
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 {
246 /* yes, this looks ugly, but guarantees that we can later use 246 /* yes, this looks ugly, but guarantees that we can later use
247 * bitmap_empty :) 247 * bitmap_empty :)
248 * NB: don't touch this bitmap, use sta_info_{set,clear}_tim_bit */ 248 * NB: don't touch this bitmap, use sta_info_{set,clear}_tim_bit */
249 u8 tim[sizeof(unsigned long) * BITS_TO_LONGS(IEEE80211_MAX_AID + 1)]; 249 u8 tim[sizeof(unsigned long) * BITS_TO_LONGS(IEEE80211_MAX_AID + 1)]
250 __aligned(__alignof__(unsigned long));
250 struct sk_buff_head bc_buf; 251 struct sk_buff_head bc_buf;
251 atomic_t num_sta_ps; /* number of stations in PS mode */ 252 atomic_t num_sta_ps; /* number of stations in PS mode */
252 int dtim_count; 253 int dtim_count;