diff options
author | Luciano Coelho <luciano.coelho@intel.com> | 2015-03-17 10:36:01 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-03-30 04:18:12 -0400 |
commit | 21fea567313641b6be69e0c684dc36c871ac848c (patch) | |
tree | 3f3598fb8fafd1ec7da0147f37cd8e014fcb9d16 /net/wireless | |
parent | a90faa9d6449f3861428bafeaf4d1fcf2be4ba7f (diff) |
nl80211: add net-detect delay to wowlan info
Pass the initial net-detect delay (NL80211_ATTR_SCHED_SCAN_DELAY)
attribute in the WoWLAN info response.
Additionally, remove a bogus TODO comment.
Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | net/wireless/nl80211.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index b02085301785..543dd51342f0 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c | |||
@@ -1099,8 +1099,6 @@ static int nl80211_send_wowlan(struct sk_buff *msg, | |||
1099 | if (large && nl80211_send_wowlan_tcp_caps(rdev, msg)) | 1099 | if (large && nl80211_send_wowlan_tcp_caps(rdev, msg)) |
1100 | return -ENOBUFS; | 1100 | return -ENOBUFS; |
1101 | 1101 | ||
1102 | /* TODO: send wowlan net detect */ | ||
1103 | |||
1104 | nla_nest_end(msg, nl_wowlan); | 1102 | nla_nest_end(msg, nl_wowlan); |
1105 | 1103 | ||
1106 | return 0; | 1104 | return 0; |
@@ -8831,6 +8829,9 @@ static int nl80211_send_wowlan_nd(struct sk_buff *msg, | |||
8831 | if (nla_put_u32(msg, NL80211_ATTR_SCHED_SCAN_INTERVAL, req->interval)) | 8829 | if (nla_put_u32(msg, NL80211_ATTR_SCHED_SCAN_INTERVAL, req->interval)) |
8832 | return -ENOBUFS; | 8830 | return -ENOBUFS; |
8833 | 8831 | ||
8832 | if (nla_put_u32(msg, NL80211_ATTR_SCHED_SCAN_DELAY, req->delay)) | ||
8833 | return -ENOBUFS; | ||
8834 | |||
8834 | freqs = nla_nest_start(msg, NL80211_ATTR_SCAN_FREQUENCIES); | 8835 | freqs = nla_nest_start(msg, NL80211_ATTR_SCAN_FREQUENCIES); |
8835 | if (!freqs) | 8836 | if (!freqs) |
8836 | return -ENOBUFS; | 8837 | return -ENOBUFS; |