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]
/
drivers
/
net
/
wireless
/
intel
/
iwlwifi
/
dvm
/
scan.c
diff --git
a/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
b/drivers/net/wireless/intel/iwlwifi/dvm/scan.c
index
81a2ddb
..
d01766f
100644
(file)
--- a/
drivers/net/wireless/intel/iwlwifi/dvm/scan.c
+++ b/
drivers/net/wireless/intel/iwlwifi/dvm/scan.c
@@
-312,7
+312,7
@@
static void iwl_rx_scan_complete_notif(struct iwl_priv *priv,
scan_notif->tsf_high, scan_notif->status);
IWL_DEBUG_SCAN(priv, "Scan on %sGHz took %dms\n",
scan_notif->tsf_high, scan_notif->status);
IWL_DEBUG_SCAN(priv, "Scan on %sGHz took %dms\n",
- (priv->scan_band ==
IEEE
80211_BAND_2GHZ) ? "2.4" : "5.2",
+ (priv->scan_band ==
NL
80211_BAND_2GHZ) ? "2.4" : "5.2",
jiffies_to_msecs(jiffies - priv->scan_start));
/*
jiffies_to_msecs(jiffies - priv->scan_start));
/*
@@
-362,9
+362,9
@@
void iwl_setup_rx_scan_handlers(struct iwl_priv *priv)
}
static u16 iwl_get_active_dwell_time(struct iwl_priv *priv,
}
static u16 iwl_get_active_dwell_time(struct iwl_priv *priv,
- enum
ieee
80211_band band, u8 n_probes)
+ enum
nl
80211_band band, u8 n_probes)
{
{
- if (band ==
IEEE
80211_BAND_5GHZ)
+ if (band ==
NL
80211_BAND_5GHZ)
return IWL_ACTIVE_DWELL_TIME_52 +
IWL_ACTIVE_DWELL_FACTOR_52GHZ * (n_probes + 1);
else
return IWL_ACTIVE_DWELL_TIME_52 +
IWL_ACTIVE_DWELL_FACTOR_52GHZ * (n_probes + 1);
else
@@
-431,9
+431,9
@@
static u16 iwl_limit_dwell(struct iwl_priv *priv, u16 dwell_time)
}
static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv,
}
static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv,
- enum
ieee
80211_band band)
+ enum
nl
80211_band band)
{
{
- u16 passive = (band ==
IEEE
80211_BAND_2GHZ) ?
+ u16 passive = (band ==
NL
80211_BAND_2GHZ) ?
IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_24 :
IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_52;
IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_24 :
IWL_PASSIVE_DWELL_BASE + IWL_PASSIVE_DWELL_TIME_52;
@@
-442,7
+442,7
@@
static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv,
/* Return valid, unused, channel for a passive scan to reset the RF */
static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
/* Return valid, unused, channel for a passive scan to reset the RF */
static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
- enum
ieee
80211_band band)
+ enum
nl
80211_band band)
{
struct ieee80211_supported_band *sband = priv->hw->wiphy->bands[band];
struct iwl_rxon_context *ctx;
{
struct ieee80211_supported_band *sband = priv->hw->wiphy->bands[band];
struct iwl_rxon_context *ctx;
@@
-470,7
+470,7
@@
static u8 iwl_get_single_channel_number(struct iwl_priv *priv,
static int iwl_get_channel_for_reset_scan(struct iwl_priv *priv,
struct ieee80211_vif *vif,
static int iwl_get_channel_for_reset_scan(struct iwl_priv *priv,
struct ieee80211_vif *vif,
- enum
ieee
80211_band band,
+ enum
nl
80211_band band,
struct iwl_scan_channel *scan_ch)
{
const struct ieee80211_supported_band *sband;
struct iwl_scan_channel *scan_ch)
{
const struct ieee80211_supported_band *sband;
@@
-492,7
+492,7
@@
static int iwl_get_channel_for_reset_scan(struct iwl_priv *priv,
cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
/* Set txpower levels to defaults */
scan_ch->dsp_atten = 110;
cpu_to_le16(IWL_RADIO_RESET_DWELL_TIME);
/* Set txpower levels to defaults */
scan_ch->dsp_atten = 110;
- if (band ==
IEEE
80211_BAND_5GHZ)
+ if (band ==
NL
80211_BAND_5GHZ)
scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
else
scan_ch->tx_gain = ((1 << 5) | (5 << 3));
scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
else
scan_ch->tx_gain = ((1 << 5) | (5 << 3));
@@
-505,7
+505,7
@@
static int iwl_get_channel_for_reset_scan(struct iwl_priv *priv,
static int iwl_get_channels_for_scan(struct iwl_priv *priv,
struct ieee80211_vif *vif,
static int iwl_get_channels_for_scan(struct iwl_priv *priv,
struct ieee80211_vif *vif,
- enum
ieee
80211_band band,
+ enum
nl
80211_band band,
u8 is_active, u8 n_probes,
struct iwl_scan_channel *scan_ch)
{
u8 is_active, u8 n_probes,
struct iwl_scan_channel *scan_ch)
{
@@
-553,7
+553,7
@@
static int iwl_get_channels_for_scan(struct iwl_priv *priv,
* power level:
* scan_ch->tx_gain = ((1 << 5) | (2 << 3)) | 3;
*/
* power level:
* scan_ch->tx_gain = ((1 << 5) | (2 << 3)) | 3;
*/
- if (band ==
IEEE
80211_BAND_5GHZ)
+ if (band ==
NL
80211_BAND_5GHZ)
scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
else
scan_ch->tx_gain = ((1 << 5) | (5 << 3));
scan_ch->tx_gain = ((1 << 5) | (3 << 3)) | 3;
else
scan_ch->tx_gain = ((1 << 5) | (5 << 3));
@@
-636,7
+636,7
@@
static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
u32 rate_flags = 0;
u16 cmd_len = 0;
u16 rx_chain = 0;
u32 rate_flags = 0;
u16 cmd_len = 0;
u16 rx_chain = 0;
- enum
ieee
80211_band band;
+ enum
nl
80211_band band;
u8 n_probes = 0;
u8 rx_ant = priv->nvm_data->valid_rx_ant;
u8 rate;
u8 n_probes = 0;
u8 rx_ant = priv->nvm_data->valid_rx_ant;
u8 rate;
@@
-750,7
+750,7
@@
static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
switch (priv->scan_band) {
scan->tx_cmd.stop_time.life_time = TX_CMD_LIFE_TIME_INFINITE;
switch (priv->scan_band) {
- case
IEEE
80211_BAND_2GHZ:
+ case
NL
80211_BAND_2GHZ:
scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;
chan_mod = le32_to_cpu(
priv->contexts[IWL_RXON_CTX_BSS].active.flags &
scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;
chan_mod = le32_to_cpu(
priv->contexts[IWL_RXON_CTX_BSS].active.flags &
@@
-771,7
+771,7
@@
static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
priv->lib->bt_params->advanced_bt_coexist)
scan->tx_cmd.tx_flags |= TX_CMD_FLG_IGNORE_BT;
break;
priv->lib->bt_params->advanced_bt_coexist)
scan->tx_cmd.tx_flags |= TX_CMD_FLG_IGNORE_BT;
break;
- case
IEEE
80211_BAND_5GHZ:
+ case
NL
80211_BAND_5GHZ:
rate = IWL_RATE_6M_PLCP;
break;
default:
rate = IWL_RATE_6M_PLCP;
break;
default:
@@
-809,7
+809,7
@@
static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
band = priv->scan_band;
band = priv->scan_band;
- if (band ==
IEEE
80211_BAND_2GHZ &&
+ if (band ==
NL
80211_BAND_2GHZ &&
priv->lib->bt_params &&
priv->lib->bt_params->advanced_bt_coexist) {
/* transmit 2.4 GHz probes only on first antenna */
priv->lib->bt_params &&
priv->lib->bt_params->advanced_bt_coexist) {
/* transmit 2.4 GHz probes only on first antenna */
@@
-925,16
+925,16
@@
static int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif)
void iwl_init_scan_params(struct iwl_priv *priv)
{
u8 ant_idx = fls(priv->nvm_data->valid_tx_ant) - 1;
void iwl_init_scan_params(struct iwl_priv *priv)
{
u8 ant_idx = fls(priv->nvm_data->valid_tx_ant) - 1;
- if (!priv->scan_tx_ant[
IEEE
80211_BAND_5GHZ])
- priv->scan_tx_ant[
IEEE
80211_BAND_5GHZ] = ant_idx;
- if (!priv->scan_tx_ant[
IEEE
80211_BAND_2GHZ])
- priv->scan_tx_ant[
IEEE
80211_BAND_2GHZ] = ant_idx;
+ if (!priv->scan_tx_ant[
NL
80211_BAND_5GHZ])
+ priv->scan_tx_ant[
NL
80211_BAND_5GHZ] = ant_idx;
+ if (!priv->scan_tx_ant[
NL
80211_BAND_2GHZ])
+ priv->scan_tx_ant[
NL
80211_BAND_2GHZ] = ant_idx;
}
int __must_check iwl_scan_initiate(struct iwl_priv *priv,
struct ieee80211_vif *vif,
enum iwl_scan_type scan_type,
}
int __must_check iwl_scan_initiate(struct iwl_priv *priv,
struct ieee80211_vif *vif,
enum iwl_scan_type scan_type,
- enum
ieee
80211_band band)
+ enum
nl
80211_band band)
{
int ret;
{
int ret;