OSDN Git Service
(root)
/
sagit-ice-cold
/
kernel_xiaomi_msm8998.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v4.4.214' into 10
[sagit-ice-cold/kernel_xiaomi_msm8998.git]
/
drivers
/
net
/
wireless
/
libertas
/
cfg.c
diff --git
a/drivers/net/wireless/libertas/cfg.c
b/drivers/net/wireless/libertas/cfg.c
index
803684e
..
4f16f87
100644
(file)
--- a/
drivers/net/wireless/libertas/cfg.c
+++ b/
drivers/net/wireless/libertas/cfg.c
@@
-23,7
+23,7
@@
#define CHAN2G(_channel, _freq, _flags) { \
#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), \
@@
-643,7
+643,7
@@
static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy,
if (chan_no != -1) {
struct wiphy *wiphy = priv->wdev->wiphy;
int freq = ieee80211_channel_to_frequency(chan_no,
if (chan_no != -1) {
struct wiphy *wiphy = priv->wdev->wiphy;
int freq = ieee80211_channel_to_frequency(chan_no,
-
IEEE
80211_BAND_2GHZ);
+
NL
80211_BAND_2GHZ);
struct ieee80211_channel *channel =
ieee80211_get_channel(wiphy, freq);
struct ieee80211_channel *channel =
ieee80211_get_channel(wiphy, freq);
@@
-1269,7
+1269,7
@@
_new_connect_scan_req(struct wiphy *wiphy, struct cfg80211_connect_params *sme)
{
struct cfg80211_scan_request *creq = NULL;
int i, n_channels = ieee80211_get_num_supported_channels(wiphy);
{
struct cfg80211_scan_request *creq = NULL;
int i, n_channels = ieee80211_get_num_supported_channels(wiphy);
- enum
ieee
80211_band band;
+ enum
nl
80211_band band;
creq = kzalloc(sizeof(*creq) + sizeof(struct cfg80211_ssid) +
n_channels * sizeof(void *),
creq = kzalloc(sizeof(*creq) + sizeof(struct cfg80211_ssid) +
n_channels * sizeof(void *),
@@
-1284,7
+1284,7
@@
_new_connect_scan_req(struct wiphy *wiphy, struct cfg80211_connect_params *sme)
/* Scan all available channels */
i = 0;
/* Scan all available channels */
i = 0;
- for (band = 0; band <
IEEE80211_NUM
_BANDS; band++) {
+ for (band = 0; band <
NUM_NL80211
_BANDS; band++) {
int j;
if (!wiphy->bands[band])
int j;
if (!wiphy->bands[band])
@@
-1854,6
+1854,7
@@
static int lbs_ibss_join_existing(struct lbs_private *priv,
if (rates_max > MAX_RATES) {
lbs_deb_join("invalid rates");
rcu_read_unlock();
if (rates_max > MAX_RATES) {
lbs_deb_join("invalid rates");
rcu_read_unlock();
+ ret = -EINVAL;
goto out;
}
rates = cmd.bss.rates;
goto out;
}
rates = cmd.bss.rates;
@@
-2172,7
+2173,7
@@
int lbs_cfg_register(struct lbs_private *priv)
if (lbs_mesh_activated(priv))
wdev->wiphy->interface_modes |= BIT(NL80211_IFTYPE_MESH_POINT);
if (lbs_mesh_activated(priv))
wdev->wiphy->interface_modes |= BIT(NL80211_IFTYPE_MESH_POINT);
- wdev->wiphy->bands[
IEEE
80211_BAND_2GHZ] = &lbs_band_2ghz;
+ wdev->wiphy->bands[
NL
80211_BAND_2GHZ] = &lbs_band_2ghz;
/*
* We could check priv->fwcapinfo && FW_CAPINFO_WPA, but I have
/*
* We could check priv->fwcapinfo && FW_CAPINFO_WPA, but I have