aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-02-25 16:17:30 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-03-06 15:30:46 -0500
commit7495883bdd07e6a233f8a7f3d85c085c1618a203 (patch)
tree1aa901fc81a0823a5ef28bd11d432b391509e316 /net
parent42096b634f87bb65e08d1fa61462d5b30d9779ca (diff)
mac80211: reorder a few fields in sta_info
Three __le16s followed by an enum (int) leave a two-byte hole of padding which we can use for two of the other fields. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/sta_info.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 4d0840b8c58e..b9dfb6fa893a 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -209,11 +209,11 @@ struct sta_info {
209 __le16 llid; /* Local link ID */ 209 __le16 llid; /* Local link ID */
210 __le16 plid; /* Peer link ID */ 210 __le16 plid; /* Peer link ID */
211 __le16 reason; /* Buffer for cancel reason on HOLDING state */ 211 __le16 reason; /* Buffer for cancel reason on HOLDING state */
212 u8 plink_retries; /* Retries in establishment */
213 bool ignore_plink_timer;
212 enum plink_state plink_state; 214 enum plink_state plink_state;
213 u32 plink_timeout; 215 u32 plink_timeout;
214 struct timer_list plink_timer; 216 struct timer_list plink_timer;
215 u8 plink_retries; /* Retries in establishment */
216 bool ignore_plink_timer;
217 spinlock_t plink_lock; /* For peer_state reads / updates and other 217 spinlock_t plink_lock; /* For peer_state reads / updates and other
218 updates in the structure. Ensures robust 218 updates in the structure. Ensures robust
219 transitions for the peerlink FSM */ 219 transitions for the peerlink FSM */