From: Bob Copeland <me@bobcopeland.com>
Date: Sat, 19 Mar 2016 02:11:31 +0000 (-0400)
Subject: mac80211: mesh: reorder structure members
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3257523bed496316dad95d5a341bfd49ac16624b;p=linux-beck.git

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 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];
 };