[PATCH 3/8] mac80211: remove useless non-NULL tests from scan results code

Johannes Berg
2008-09-08T15:45:40Z

I'm surprised nobody complained about these before. What a waste.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
net/mac80211/mlme.c | 40 ++++++++++++++++++----------------------
1 file changed, 18 insertions(+), 22 deletions(-)

--- everything.orig/net/mac80211/mlme.c 2008-09-08 15:42:38.000000000 +0200
+++ everything/net/mac80211/mlme.c 2008-09-08 15:42:40.000000000 +0200
@@ -3823,6 +3823,7 @@ ieee80211_sta_scan_result(struct ieee802
char *current_ev, char *end_buf)
{
struct iw_event iwe;
+ char *buf;

if (time_after(jiffies,
bss->last_update + IEEE80211_SCAN_RESULT_EXPIRE))
@@ -3897,7 +3898,7 @@ ieee80211_sta_scan_result(struct ieee802

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 */
char *p = current_ev + iwe_stream_lcp_len(info);
int i;
@@ -3916,30 +3917,25 @@ ieee80211_sta_scan_result(struct ieee802
current_ev = p;
}

- if (bss) {
- char *buf;
- buf = kmalloc(30, GFP_ATOMIC);
- if (buf) {
- memset(&iwe, 0, sizeof(iwe));
- iwe.cmd = IWEVCUSTOM;
- sprintf(buf, "tsf=%016llx", (unsigned long long)(bss->timestamp));
- iwe.u.data.length = strlen(buf);
- current_ev = iwe_stream_add_point(info, current_ev,
- end_buf,
- &iwe, buf);
- memset(&iwe, 0, sizeof(iwe));
- iwe.cmd = IWEVCUSTOM;
- sprintf(buf, " Last beacon: %dms ago",
- jiffies_to_msecs(jiffies - bss->last_update));
- iwe.u.data.length = strlen(buf);
- current_ev = iwe_stream_add_point(info, current_ev,
- end_buf, &iwe, buf);
- kfree(buf);
- }
+ buf = kmalloc(30, GFP_ATOMIC);
+ if (buf) {
+ memset(&iwe, 0, sizeof(iwe));
+ iwe.cmd = IWEVCUSTOM;
+ sprintf(buf, "tsf=%016llx", (unsigned long long)(bss->timestamp));
+ iwe.u.data.length = strlen(buf);
+ current_ev = iwe_stream_add_point(info, current_ev, end_buf,
+ &iwe, buf);
+ memset(&iwe, 0, sizeof(iwe));
+ iwe.cmd = IWEVCUSTOM;
+ sprintf(buf, " Last beacon: %dms ago",
+ jiffies_to_msecs(jiffies - bss->last_update));
+ iwe.u.data.length = strlen(buf);
+ current_ev = iwe_stream_add_point(info, current_ev,
+ end_buf, &iwe, buf);
+ kfree(buf);
}

if (bss_mesh_cfg(bss)) {
- char *buf;
u8 *cfg = bss_mesh_cfg(bss);
buf = kmalloc(50, GFP_ATOMIC);
if (buf) {

--