Commit 67626964 authored Sep 06, 2018 by Colin Ian King Committed by Johannes Berg Oct 02, 2018

cfg80211: remove redundant check of !scan_plan



The check for !scan_plan is redunant as this has been checked
in the proceeding statement and the code returns -ENOBUFS if
it is true. Remove the redundant check.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent d25d062f

net/wireless/nl80211.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -10690,8 +10690,7 @@ static int nl80211_send_wowlan_nd(struct sk_buff *msg,
		if (!scan_plan)
		return -ENOBUFS;

		if (!scan_plan \|\|
		nla_put_u32(msg, NL80211_SCHED_SCAN_PLAN_INTERVAL,
		if (nla_put_u32(msg, NL80211_SCHED_SCAN_PLAN_INTERVAL,
		req->scan_plans[i].interval) \|\|
		(req->scan_plans[i].iterations &&
		nla_put_u32(msg, NL80211_SCHED_SCAN_PLAN_ITERATIONS,

Admin message