diff options
| author |   Johannes Berg <johannes@sipsolutions.net> | 2008-02-25 22:17:30 +0100 |
|---|---|---|
| committer |   John W. Linville <linville@tuxdriver.com> | 2008-03-06 15:30:46 -0500 |
| commit | 7495883bdd07e6a233f8a7f3d85c085c1618a203 (patch) | |
| tree | 1aa901fc81a0823a5ef28bd11d432b391509e316 /net/mac80211/sta_info.h | |
| parent | mac80211: fix kernel-doc comment for mesh_plink_deactivate (diff) | |
| download | linux-dev-7495883bdd07e6a233f8a7f3d85c085c1618a203.tar.xz linux-dev-7495883bdd07e6a233f8a7f3d85c085c1618a203.zip | |
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/mac80211/sta_info.h')
| -rw-r--r-- | net/mac80211/sta_info.h | 4 |
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 { __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 */ |