From: Johannes Berg Date: Mon, 25 Feb 2008 21:17:30 +0000 (+0100) Subject: mac80211: reorder a few fields in sta_info X-Git-Tag: v2.6.26-rc1~1138^2~454^2~65 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7495883bdd07e6a233f8a7f3d85c085c1618a203;p=~emulex%2Finfiniband.git 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 Signed-off-by: John W. Linville --- diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h index 4d0840b8c58..b9dfb6fa893 100644 --- 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 */