summaryrefslogtreecommitdiff
path: root/net/mac80211/mesh_hwmp.c
diff options
context:
space:
mode:
authorBob Copeland <me@bobcopeland.com>2014-04-15 18:43:06 +0400
committerJohannes Berg <johannes.berg@intel.com>2014-04-22 19:24:49 +0400
commitaee6499c8c6d0d1bc75cbae51f89c4d35a5aaa1f (patch)
tree59471e267fdfed0618adc81b8749c00c0e19b64f /net/mac80211/mesh_hwmp.c
parent9a07bf507dfc5402e63d96596341f2a15e4142c7 (diff)
downloadlinux-aee6499c8c6d0d1bc75cbae51f89c4d35a5aaa1f.tar.xz
mac80211: mesh: use u16 return type for u16 getter
u16_field_get() is a simple wrapper around get_unaligned_le16(), and it is being assigned to a u16, so there's no need to promote to u32 in the middle. Signed-off-by: Bob Copeland <me@bobcopeland.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mesh_hwmp.c')
-rw-r--r--net/mac80211/mesh_hwmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c
index f9514685d45a..03ff5ea95559 100644
--- a/net/mac80211/mesh_hwmp.c
+++ b/net/mac80211/mesh_hwmp.c
@@ -37,7 +37,7 @@ static inline u32 u32_field_get(const u8 *preq_elem, int offset, bool ae)
return get_unaligned_le32(preq_elem + offset);
}
-static inline u32 u16_field_get(const u8 *preq_elem, int offset, bool ae)
+static inline u16 u16_field_get(const u8 *preq_elem, int offset, bool ae)
{
if (ae)
offset += 6;