Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f2aea82 authored by Jeff Mahoney's avatar Jeff Mahoney Committed by John Stultz
Browse files

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: default avatarJeff Mahoney <jeffm@suse.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
[jstultz: Cherry-picked to android-4.4]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 1f95b0e9

net/mac80211/mesh_hwmp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;