Re: [PATCH] mac80211: remove "bcn_int" and "capab" scan results info

[Johannes Berg <johannes@sipsolutions.net>]

[-- Attachment #1: Type: text/plain, Size: 1429 bytes --]


On Wed, 2007-11-21 at 11:55 -0500, John W. Linville wrote:
> These bits were dead code before "mac80211: Remove local->scan_flags"
> (commit 6681dd3fd0e4d36a4547415853e83411baa7b705) and probably should
> have been removed as part of that commit.

I'm all for it. But Jouni complained although this code couldn't be
triggered. I think Jouni's objections will be addressed with nl80211
work though, so maybe we can remove it for now anyway?

johannes

> diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/ieee80211_sta.c
> index 2a321f0..936f1cd 100644
> --- a/net/mac80211/ieee80211_sta.c
> +++ b/net/mac80211/ieee80211_sta.c
> @@ -3001,31 +3001,6 @@ ieee80211_sta_scan_result(struct net_device *dev,
>  		}
>  	}
>  
> -	do {
> -		char *buf;
> -
> -		buf = kmalloc(100, GFP_ATOMIC);
> -		if (!buf)
> -			break;
> -
> -		memset(&iwe, 0, sizeof(iwe));
> -		iwe.cmd = IWEVCUSTOM;
> -		sprintf(buf, "bcn_int=%d", bss->beacon_int);
> -		iwe.u.data.length = strlen(buf);
> -		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
> -						  buf);
> -
> -		memset(&iwe, 0, sizeof(iwe));
> -		iwe.cmd = IWEVCUSTOM;
> -		sprintf(buf, "capab=0x%04x", bss->capability);
> -		iwe.u.data.length = strlen(buf);
> -		current_ev = iwe_stream_add_point(current_ev, end_buf, &iwe,
> -						  buf);
> -
> -		kfree(buf);
> -		break;
> -	} while (0);
> -
>  	return current_ev;
>  }
>  

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 828 bytes --]