linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: Marek Lindner <lindner_marek@yahoo.de>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH] mac80211: don't allow zero mac bssid to be configured
Date: Thu, 15 Sep 2011 18:21:38 +0200	[thread overview]
Message-ID: <1316103698.3992.12.camel@jlt3.sipsolutions.net> (raw)
In-Reply-To: <1316102844-29970-1-git-send-email-lindner_marek@yahoo.de> (sfid-20110915_181048_539834_E4954A19)

How is this related to configuration? Shouldn't the configuration check
be in cfg80211 instead?

johannes


On Thu, 2011-09-15 at 18:07 +0200, Marek Lindner wrote:
> Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
> ---
>  net/mac80211/ibss.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
> index 4f9235b..9c7991e 100644
> --- a/net/mac80211/ibss.c
> +++ b/net/mac80211/ibss.c
> @@ -588,12 +588,10 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata)
>  	capability = WLAN_CAPABILITY_IBSS;
>  	if (ifibss->privacy)
>  		capability |= WLAN_CAPABILITY_PRIVACY;
> -	if (ifibss->fixed_bssid)
> +	if (ifibss->fixed_bssid && !is_zero_ether_addr(ifibss->bssid))
>  		bssid = ifibss->bssid;
>  	if (ifibss->fixed_channel)
>  		chan = ifibss->channel;
> -	if (!is_zero_ether_addr(ifibss->bssid))
> -		bssid = ifibss->bssid;
>  	cbss = cfg80211_get_bss(local->hw.wiphy, chan, bssid,
>  				ifibss->ssid, ifibss->ssid_len,
>  				WLAN_CAPABILITY_IBSS | WLAN_CAPABILITY_PRIVACY,



  reply	other threads:[~2011-09-15 16:21 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-09-15 16:07 [PATCH] mac80211: don't allow zero mac bssid to be configured Marek Lindner
2011-09-15 16:21 ` Johannes Berg [this message]
2011-09-16  3:14   ` Marek Lindner
2011-09-16  6:19     ` Johannes Berg
2011-09-16 11:27       ` Marek Lindner
2011-09-16 11:41         ` Johannes Berg
2011-09-16 11:49           ` Johannes Berg
2011-09-16 12:12             ` Marek Lindner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1316103698.3992.12.camel@jlt3.sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=lindner_marek@yahoo.de \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).