projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cfg80211: remove enum ieee80211_band
[cascardo/linux.git]
/
net
/
mac80211
/
scan.c
diff --git
a/net/mac80211/scan.c
b/net/mac80211/scan.c
index
ae980ce
..
f9648ef
100644
(file)
--- a/
net/mac80211/scan.c
+++ b/
net/mac80211/scan.c
@@
-66,7
+66,9
@@
ieee80211_bss_info_update(struct ieee80211_local *local,
struct cfg80211_bss *cbss;
struct ieee80211_bss *bss;
int clen, srlen;
struct cfg80211_bss *cbss;
struct ieee80211_bss *bss;
int clen, srlen;
- struct cfg80211_inform_bss bss_meta = {};
+ struct cfg80211_inform_bss bss_meta = {
+ .boottime_ns = rx_status->boottime_ns,
+ };
bool signal_valid;
if (ieee80211_hw_check(&local->hw, SIGNAL_DBM))
bool signal_valid;
if (ieee80211_hw_check(&local->hw, SIGNAL_DBM))
@@
-270,7
+272,7
@@
static bool ieee80211_prep_hw_scan(struct ieee80211_local *local)
n_chans = req->n_channels;
} else {
do {
n_chans = req->n_channels;
} else {
do {
- if (local->hw_scan_band ==
IEEE80211_NUM
_BANDS)
+ if (local->hw_scan_band ==
NUM_NL80211
_BANDS)
return false;
n_chans = 0;
return false;
n_chans = 0;
@@
-303,6
+305,7
@@
static bool ieee80211_prep_hw_scan(struct ieee80211_local *local)
ether_addr_copy(local->hw_scan_req->req.mac_addr, req->mac_addr);
ether_addr_copy(local->hw_scan_req->req.mac_addr_mask,
req->mac_addr_mask);
ether_addr_copy(local->hw_scan_req->req.mac_addr, req->mac_addr);
ether_addr_copy(local->hw_scan_req->req.mac_addr_mask,
req->mac_addr_mask);
+ ether_addr_copy(local->hw_scan_req->req.bssid, req->bssid);
return true;
}
return true;
}
@@
-482,7
+485,7
@@
static void ieee80211_scan_state_send_probe(struct ieee80211_local *local,
int i;
struct ieee80211_sub_if_data *sdata;
struct cfg80211_scan_request *scan_req;
int i;
struct ieee80211_sub_if_data *sdata;
struct cfg80211_scan_request *scan_req;
- enum
ieee
80211_band band = local->hw.conf.chandef.chan->band;
+ enum
nl
80211_band band = local->hw.conf.chandef.chan->band;
u32 tx_flags;
scan_req = rcu_dereference_protected(local->scan_req,
u32 tx_flags;
scan_req = rcu_dereference_protected(local->scan_req,
@@
-497,7
+500,7
@@
static void ieee80211_scan_state_send_probe(struct ieee80211_local *local,
for (i = 0; i < scan_req->n_ssids; i++)
ieee80211_send_probe_req(
for (i = 0; i < scan_req->n_ssids; i++)
ieee80211_send_probe_req(
- sdata, local->scan_addr,
NULL
,
+ sdata, local->scan_addr,
scan_req->bssid
,
scan_req->ssids[i].ssid, scan_req->ssids[i].ssid_len,
scan_req->ie, scan_req->ie_len,
scan_req->rates[band], false,
scan_req->ssids[i].ssid, scan_req->ssids[i].ssid_len,
scan_req->ie, scan_req->ie_len,
scan_req->rates[band], false,
@@
-562,6
+565,7
@@
static int __ieee80211_start_scan(struct ieee80211_sub_if_data *sdata,
req->n_channels * sizeof(req->channels[0]);
local->hw_scan_req->req.ie = ies;
local->hw_scan_req->req.flags = req->flags;
req->n_channels * sizeof(req->channels[0]);
local->hw_scan_req->req.ie = ies;
local->hw_scan_req->req.flags = req->flags;
+ eth_broadcast_addr(local->hw_scan_req->req.bssid);
local->hw_scan_band = 0;
local->hw_scan_band = 0;
@@
-949,7
+953,7
@@
int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
{
struct ieee80211_local *local = sdata->local;
int ret = -EBUSY, i, n_ch = 0;
{
struct ieee80211_local *local = sdata->local;
int ret = -EBUSY, i, n_ch = 0;
- enum
ieee
80211_band band;
+ enum
nl
80211_band band;
mutex_lock(&local->mtx);
mutex_lock(&local->mtx);
@@
-961,7
+965,7
@@
int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata,
if (!channels) {
int max_n;
if (!channels) {
int max_n;
- for (band = 0; band <
IEEE80211_NUM
_BANDS; band++) {
+ for (band = 0; band <
NUM_NL80211
_BANDS; band++) {
if (!local->hw.wiphy->bands[band])
continue;
if (!local->hw.wiphy->bands[band])
continue;
@@
-1081,7
+1085,7
@@
int __ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata,
struct ieee80211_scan_ies sched_scan_ies = {};
struct cfg80211_chan_def chandef;
int ret, i, iebufsz, num_bands = 0;
struct ieee80211_scan_ies sched_scan_ies = {};
struct cfg80211_chan_def chandef;
int ret, i, iebufsz, num_bands = 0;
- u32 rate_masks[
IEEE80211_NUM
_BANDS] = {};
+ u32 rate_masks[
NUM_NL80211
_BANDS] = {};
u8 bands_used = 0;
u8 *ie;
size_t len;
u8 bands_used = 0;
u8 *ie;
size_t len;
@@
-1093,7
+1097,7
@@
int __ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata,
if (!local->ops->sched_scan_start)
return -ENOTSUPP;
if (!local->ops->sched_scan_start)
return -ENOTSUPP;
- for (i = 0; i <
IEEE80211_NUM
_BANDS; i++) {
+ for (i = 0; i <
NUM_NL80211
_BANDS; i++) {
if (local->hw.wiphy->bands[i]) {
bands_used |= BIT(i);
rate_masks[i] = (u32) -1;
if (local->hw.wiphy->bands[i]) {
bands_used |= BIT(i);
rate_masks[i] = (u32) -1;