From: Bob Copeland <me@bobcopeland.com>
Date: Tue, 15 Apr 2014 14:43:06 +0000 (-0400)
Subject: mac80211: mesh: use u16 return type for u16 getter
X-Git-Tag: firefly_0821_release~176^2~3540^2~11^2~7^2~46^2~73
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=aee6499c8c6d0d1bc75cbae51f89c4d35a5aaa1f;p=firefly-linux-kernel-4.4.55.git

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>
---

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;