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>

diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h
index 46b540a25d9d38e6cce8161522dc3e5752fc9860..4a59c034cc6d71dd555f722547c457e157ed9cb9 100644 (file)
--- 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];
 };