diff options
| author |   Colin Ian King <colin.king@canonical.com> | 2018-09-06 10:58:44 +0100 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2018-10-02 09:56:29 +0200 |
| commit | 6762696429bbc4b2e1b6e5996c3d99da8bbc627d (patch) | |
| tree | 7fc0d66425399c7c3747aba072a1d57934bb82f5 /net/wireless | |
| parent | cfg80211: remove unnecessary null pointer check in cfg80211_netdev_notifier_call (diff) | |
| download | linux-dev-6762696429bbc4b2e1b6e5996c3d99da8bbc627d.tar.xz linux-dev-6762696429bbc4b2e1b6e5996c3d99da8bbc627d.zip | |
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>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index d5f9b5235cdd..b4908bcb0d77 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -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, |