---

yaml --- r: 90080 b: refs/heads/master c: 7495883 h: refs/heads/master v: v3
git-mirror · Mar 6, 2008 · e033818 · e033818
1 parent 80248f2
commit e033818
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 42096b634f87bb65e08d1fa61462d5b30d9779ca
+refs/heads/master: 7495883bdd07e6a233f8a7f3d85c085c1618a203
diff --git a/trunk/net/mac80211/sta_info.h b/trunk/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 */