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
/
staging
/
wilc1000
/
wilc_wfi_cfgoperations.c
diff --git
a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index
b76622d
..
544917d
100644
(file)
--- a/
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@
-102,7
+102,7
@@
static u8 op_ifcs;
u8 wilc_initialized = 1;
#define CHAN2G(_channel, _freq, _flags) { \
u8 wilc_initialized = 1;
#define CHAN2G(_channel, _freq, _flags) { \
- .band =
IEEE
80211_BAND_2GHZ, \
+ .band =
NL
80211_BAND_2GHZ, \
.center_freq = (_freq), \
.hw_value = (_channel), \
.flags = (_flags), \
.center_freq = (_freq), \
.hw_value = (_channel), \
.flags = (_flags), \
@@
-241,7
+241,7
@@
static void refresh_scan(void *user_void, u8 all, bool direct_scan)
struct ieee80211_channel *channel;
if (network_info) {
struct ieee80211_channel *channel;
if (network_info) {
- freq = ieee80211_channel_to_frequency((s32)network_info->ch,
IEEE
80211_BAND_2GHZ);
+ freq = ieee80211_channel_to_frequency((s32)network_info->ch,
NL
80211_BAND_2GHZ);
channel = ieee80211_get_channel(wiphy, freq);
rssi = get_rssi_avg(network_info);
channel = ieee80211_get_channel(wiphy, freq);
rssi = get_rssi_avg(network_info);
@@
-409,7
+409,7
@@
static void CfgScanResult(enum scan_event scan_event,
return;
if (network_info) {
return;
if (network_info) {
- s32Freq = ieee80211_channel_to_frequency((s32)network_info->ch,
IEEE
80211_BAND_2GHZ);
+ s32Freq = ieee80211_channel_to_frequency((s32)network_info->ch,
NL
80211_BAND_2GHZ);
channel = ieee80211_get_channel(wiphy, s32Freq);
if (!channel)
channel = ieee80211_get_channel(wiphy, s32Freq);
if (!channel)
@@
-1451,7
+1451,7
@@
void WILC_WFI_p2p_rx(struct net_device *dev, u8 *buff, u32 size)
return;
}
} else {
return;
}
} else {
- s32Freq = ieee80211_channel_to_frequency(curr_channel,
IEEE
80211_BAND_2GHZ);
+ s32Freq = ieee80211_channel_to_frequency(curr_channel,
NL
80211_BAND_2GHZ);
if (ieee80211_is_action(buff[FRAME_TYPE_ID])) {
if (priv->bCfgScanning && time_after_eq(jiffies, (unsigned long)pstrWFIDrv->p2p_timeout)) {
if (ieee80211_is_action(buff[FRAME_TYPE_ID])) {
if (priv->bCfgScanning && time_after_eq(jiffies, (unsigned long)pstrWFIDrv->p2p_timeout)) {
@@
-2170,6
+2170,13
@@
static int get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
int ret;
struct wilc_priv *priv = wiphy_priv(wiphy);
struct wilc_vif *vif = netdev_priv(priv->dev);
int ret;
struct wilc_priv *priv = wiphy_priv(wiphy);
struct wilc_vif *vif = netdev_priv(priv->dev);
+ struct wilc *wl;
+
+ wl = vif->wilc;
+
+ /* If firmware is not started, return. */
+ if (!wl->initialized)
+ return -EIO;
ret = wilc_get_tx_power(vif, (u8 *)dbm);
if (ret)
ret = wilc_get_tx_power(vif, (u8 *)dbm);
if (ret)
@@
-2239,7
+2246,7
@@
static struct wireless_dev *WILC_WFI_CfgAlloc(void)
WILC_WFI_band_2ghz.ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_8K;
WILC_WFI_band_2ghz.ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_NONE;
WILC_WFI_band_2ghz.ht_cap.ampdu_factor = IEEE80211_HT_MAX_AMPDU_8K;
WILC_WFI_band_2ghz.ht_cap.ampdu_density = IEEE80211_HT_MPDU_DENSITY_NONE;
- wdev->wiphy->bands[
IEEE
80211_BAND_2GHZ] = &WILC_WFI_band_2ghz;
+ wdev->wiphy->bands[
NL
80211_BAND_2GHZ] = &WILC_WFI_band_2ghz;
return wdev;
return wdev;