projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
ieee80211
/
ieee80211_wx.c
diff --git
a/net/ieee80211/ieee80211_wx.c
b/net/ieee80211/ieee80211_wx.c
index cee5e13bc4270687f76cea2330543f3d373930c7..d309e8f199929618b1fb0a2ee02fc9aed362b881 100644
(file)
--- a/
net/ieee80211/ieee80211_wx.c
+++ b/
net/ieee80211/ieee80211_wx.c
@@
-89,12
+89,11
@@
static char *ieee80211_translate_scan(struct ieee80211_device *ieee,
start = iwe_stream_add_event(start, stop, &iwe, IW_EV_UINT_LEN);
}
start = iwe_stream_add_event(start, stop, &iwe, IW_EV_UINT_LEN);
}
- /* Add frequency/channel */
+ /* Add channel and frequency */
+ /* Note : userspace automatically computes channel using iwrange */
iwe.cmd = SIOCGIWFREQ;
iwe.cmd = SIOCGIWFREQ;
-/* iwe.u.freq.m = ieee80211_frequency(network->channel, network->mode);
- iwe.u.freq.e = 3; */
- iwe.u.freq.m = network->channel;
- iwe.u.freq.e = 0;
+ iwe.u.freq.m = ieee80211_channel_to_freq(ieee, network->channel);
+ iwe.u.freq.e = 6;
iwe.u.freq.i = 0;
start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
iwe.u.freq.i = 0;
start = iwe_stream_add_event(start, stop, &iwe, IW_EV_FREQ_LEN);
@@
-258,6
+257,7
@@
int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
char *ev = extra;
char *stop = ev + wrqu->data.length;
int i = 0;
char *ev = extra;
char *stop = ev + wrqu->data.length;
int i = 0;
+ DECLARE_MAC_BUF(mac);
IEEE80211_DEBUG_WX("Getting scan\n");
IEEE80211_DEBUG_WX("Getting scan\n");
@@
-275,10
+275,10
@@
int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
ev = ieee80211_translate_scan(ieee, ev, stop, network);
else
IEEE80211_DEBUG_SCAN("Not showing network '%s ("
ev = ieee80211_translate_scan(ieee, ev, stop, network);
else
IEEE80211_DEBUG_SCAN("Not showing network '%s ("
-
MAC_FMT "
)' due to age (%dms).\n",
+
"%s
)' due to age (%dms).\n",
escape_essid(network->ssid,
network->ssid_len),
escape_essid(network->ssid,
network->ssid_len),
-
MAC_ARG(
network->bssid),
+
print_mac(mac,
network->bssid),
jiffies_to_msecs(jiffies -
network->
last_scanned));
jiffies_to_msecs(jiffies -
network->
last_scanned));
@@
-409,7
+409,7
@@
int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
(*crypt)->priv);
sec.flags |= (1 << key);
/* This ensures a key will be activated if no key is
(*crypt)->priv);
sec.flags |= (1 << key);
/* This ensures a key will be activated if no key is
- * explicit
e
ly set */
+ * explicitly set */
if (key == sec.active_key)
sec.flags |= SEC_ACTIVE_KEY;
if (key == sec.active_key)
sec.flags |= SEC_ACTIVE_KEY;