summaryrefslogtreecommitdiff
path: root/net/mac80211
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2016-03-18 22:11:31 -0400
committerJohannes Berg <johannes.berg@intel.com>2016-04-05 21:34:52 +0200
commit3257523bed496316dad95d5a341bfd49ac16624b (patch)
tree3561bde5607d83ab5f607027b3695372b8b0ce9d /net/mac80211
parent18b27ff7d2e232b0f07f2f51aa8052ff2a617908 (diff)
mac80211: mesh: reorder structure members
Reduce padding waste in struct mesh_table and struct rmc_entry by moving the smaller fields to the end. Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/mesh.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 46b540a25d9d..4a59c034cc6d 100644
--- a/net/mac80211/mesh.h
+++ b/net/mac80211/mesh.h
@@ -133,11 +133,10 @@ struct mesh_path {
* @rhash: the rhashtable containing struct mesh_paths, keyed by dest addr
*/
struct mesh_table {
- atomic_t entries; /* Up to MAX_MESH_NEIGHBOURS */
struct hlist_head known_gates;
spinlock_t gates_lock;
-
struct rhashtable rhead;
+ atomic_t entries; /* Up to MAX_MESH_NEIGHBOURS */
};
/* Recent multicast cache */
@@ -159,8 +158,8 @@ struct mesh_table {
*/
struct rmc_entry {
struct hlist_node list;
- u32 seqnum;
unsigned long exp_time;
+ u32 seqnum;
u8 sa[ETH_ALEN];
};