OSDN Git Service

mac80211: ftm responder: remove pointless defensive coding
authorJohannes Berg <johannes.berg@intel.com>
Sat, 15 Dec 2018 09:03:24 +0000 (11:03 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 18 Dec 2018 12:14:58 +0000 (13:14 +0100)
The pointer and corresponding length is always set in pairs
in cfg80211, so no need to have this strange defensive check
that also confuses static checkers. Clean it up.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c

index cf8f946..567c63f 100644 (file)
@@ -800,8 +800,8 @@ static int ieee80211_set_ftm_responder_params(
        u8 *pos;
        int len;
 
-       if ((!lci || !lci_len) && (!civicloc || !civicloc_len))
-               return 1;
+       if (!lci_len && !civicloc_len)
+               return 0;
 
        bss_conf = &sdata->vif.bss_conf;
        old = bss_conf->ftmr_params;