From: Jeff Mahoney Date: Mon, 4 Apr 2016 18:15:23 +0000 (-0400) Subject: UPSTREAM: mac80211: fix "warning: ‘target_metric’ may be used uninitialized" X-Git-Tag: firefly_0821_release~176^2~399^2 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=63a2b92307eb8fff4451ae58ca937dd6aa899469;p=firefly-linux-kernel-4.4.55.git UPSTREAM: mac80211: fix "warning: ‘target_metric’ may be used uninitialized" (This cherry-picks b4201cc4fc6e1c57d6d306b1f787865043d60129 upstream) This fixes: net/mac80211/mesh_hwmp.c:603:26: warning: ‘target_metric’ may be used uninitialized in this function target_metric is only consumed when reply = true so no bug exists here, but not all versions of gcc realize it. Initialize to 0 to remove the warning. Change-Id: I13923fda9d314f48196c29e4354133dfe01f5abd Signed-off-by: Jeff Mahoney Signed-off-by: Johannes Berg [jstultz: Cherry-picked to android-4.4] Signed-off-by: John Stultz --- diff --git a/net/mac80211/mesh_hwmp.c b/net/mac80211/mesh_hwmp.c index c6be0b4f4058..b6dc2d7cd650 100644 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c @@ -530,7 +530,7 @@ static void hwmp_preq_frame_process(struct ieee80211_sub_if_data *sdata, const u8 *target_addr, *orig_addr; const u8 *da; u8 target_flags, ttl, flags; - u32 orig_sn, target_sn, lifetime, target_metric; + u32 orig_sn, target_sn, lifetime, target_metric = 0; bool reply = false; bool forward = true; bool root_is_gate;