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>

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 4d0840b8c58ecb5d259afba10d448e848b082608..b9dfb6fa893a6c1b733158c187c5d1fd918c0e69 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -209,11 +209,11 @@ struct sta_info {
        __le16 llid;            /* Local link ID */
        __le16 plid;            /* Peer link ID */
        __le16 reason;          /* Buffer for cancel reason on HOLDING state */
+       u8 plink_retries;       /* Retries in establishment */
+       bool ignore_plink_timer;
        enum plink_state plink_state;
        u32 plink_timeout;
        struct timer_list plink_timer;
-       u8 plink_retries;       /* Retries in establishment */
-       bool ignore_plink_timer;
        spinlock_t plink_lock;  /* For peer_state reads / updates and other
                                   updates in the structure. Ensures robust
                                   transitions for the peerlink FSM */