浏览代码

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>
Johannes Berg 17 年之前
父节点
当前提交
7495883bdd
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      net/mac80211/sta_info.h

+ 2 - 2
net/mac80211/sta_info.h

@@ -209,11 +209,11 @@ struct sta_info {
 	__le16 llid;		/* Local link ID */
 	__le16 llid;		/* Local link ID */
 	__le16 plid;		/* Peer link ID */
 	__le16 plid;		/* Peer link ID */
 	__le16 reason;		/* Buffer for cancel reason on HOLDING state */
 	__le16 reason;		/* Buffer for cancel reason on HOLDING state */
+	u8 plink_retries;	/* Retries in establishment */
+	bool ignore_plink_timer;
 	enum plink_state plink_state;
 	enum plink_state plink_state;
 	u32 plink_timeout;
 	u32 plink_timeout;
 	struct timer_list plink_timer;
 	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
 	spinlock_t plink_lock;	/* For peer_state reads / updates and other
 				   updates in the structure. Ensures robust
 				   updates in the structure. Ensures robust
 				   transitions for the peerlink FSM */
 				   transitions for the peerlink FSM */