Commit ee96d6ef authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville

mac80211: remove useless non-NULL tests from scan results code

I'm surprised nobody complained about these before. What a waste.
Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 491775a5
...@@ -3822,6 +3822,7 @@ ieee80211_sta_scan_result(struct ieee80211_local *local, ...@@ -3822,6 +3822,7 @@ ieee80211_sta_scan_result(struct ieee80211_local *local,
char *current_ev, char *end_buf) char *current_ev, char *end_buf)
{ {
struct iw_event iwe; struct iw_event iwe;
char *buf;
if (time_after(jiffies, if (time_after(jiffies,
bss->last_update + IEEE80211_SCAN_RESULT_EXPIRE)) bss->last_update + IEEE80211_SCAN_RESULT_EXPIRE))
...@@ -3896,7 +3897,7 @@ ieee80211_sta_scan_result(struct ieee80211_local *local, ...@@ -3896,7 +3897,7 @@ ieee80211_sta_scan_result(struct ieee80211_local *local,
ieee80211_sta_add_scan_ies(info, bss, &current_ev, end_buf); ieee80211_sta_add_scan_ies(info, bss, &current_ev, end_buf);
if (bss && bss->supp_rates_len > 0) { if (bss->supp_rates_len > 0) {
/* display all supported rates in readable format */ /* display all supported rates in readable format */
char *p = current_ev + iwe_stream_lcp_len(info); char *p = current_ev + iwe_stream_lcp_len(info);
int i; int i;
...@@ -3915,16 +3916,13 @@ ieee80211_sta_scan_result(struct ieee80211_local *local, ...@@ -3915,16 +3916,13 @@ ieee80211_sta_scan_result(struct ieee80211_local *local,
current_ev = p; current_ev = p;
} }
if (bss) {
char *buf;
buf = kmalloc(30, GFP_ATOMIC); buf = kmalloc(30, GFP_ATOMIC);
if (buf) { if (buf) {
memset(&iwe, 0, sizeof(iwe)); memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVCUSTOM; iwe.cmd = IWEVCUSTOM;
sprintf(buf, "tsf=%016llx", (unsigned long long)(bss->timestamp)); sprintf(buf, "tsf=%016llx", (unsigned long long)(bss->timestamp));
iwe.u.data.length = strlen(buf); iwe.u.data.length = strlen(buf);
current_ev = iwe_stream_add_point(info, current_ev, current_ev = iwe_stream_add_point(info, current_ev, end_buf,
end_buf,
&iwe, buf); &iwe, buf);
memset(&iwe, 0, sizeof(iwe)); memset(&iwe, 0, sizeof(iwe));
iwe.cmd = IWEVCUSTOM; iwe.cmd = IWEVCUSTOM;
...@@ -3935,10 +3933,8 @@ ieee80211_sta_scan_result(struct ieee80211_local *local, ...@@ -3935,10 +3933,8 @@ ieee80211_sta_scan_result(struct ieee80211_local *local,
end_buf, &iwe, buf); end_buf, &iwe, buf);
kfree(buf); kfree(buf);
} }
}
if (bss_mesh_cfg(bss)) { if (bss_mesh_cfg(bss)) {
char *buf;
u8 *cfg = bss_mesh_cfg(bss); u8 *cfg = bss_mesh_cfg(bss);
buf = kmalloc(50, GFP_ATOMIC); buf = kmalloc(50, GFP_ATOMIC);
if (buf) { if (buf) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment