diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-02-04 21:01:25 +0100 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-02-12 15:07:18 +0100 |
| commit | 9900e4843c6c95cc951a642e337478831429be88 (patch) | |
| tree | 65e65aa55a9e83a13bfceb413a59abb8de584218 /net/wireless | |
| parent | cfg80211: remove NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL (diff) | |
| download | linux-9900e4843c6c95cc951a642e337478831429be88.tar.xz linux-9900e4843c6c95cc951a642e337478831429be88.zip | |
nl80211: use ie_len in scheduled scan
We've already checked the IE length and assigned request->ie
based on that, so continue using it to make the code a bit
clearer.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/nl80211.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index ebea1a197afb..179786494308 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5709,8 +5709,8 @@ static int nl80211_start_sched_scan(struct sk_buff *skb, request->min_rssi_thold = NL80211_SCAN_RSSI_THOLD_OFF; } - if (info->attrs[NL80211_ATTR_IE]) { - request->ie_len = nla_len(info->attrs[NL80211_ATTR_IE]); + if (ie_len) { + request->ie_len = ie_len; memcpy((void *)request->ie, nla_data(info->attrs[NL80211_ATTR_IE]), request->ie_len); |