linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [RFC: which stable kernels?] b43: fix frequency reported on G-PHY with /new/ firmware
@ 2014-06-12  7:28 Rafał Miłecki
  2014-06-12  7:35 ` Emmanuel Grumbach
  0 siblings, 1 reply; 4+ messages in thread
From: Rafał Miłecki @ 2014-06-12  7:28 UTC (permalink / raw)
  To: linux-wireless, b43-dev; +Cc: Aaro Koskinen, Rafał Miłecki

---
This bug was there for years, however didn't cause any problems. It was
exposed recently by the 3.15 release by the:

commit 3afc2167f60a327a2c1e1e2600ef209a3c2b75b7
Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date:   Tue Mar 4 16:50:13 2014 +0200

    cfg80211/mac80211: ignore signal if the frame was heard on wrong channel

Should we mark it for stable for 3.15 only? Or all olders kernels as well?
---
 drivers/net/wireless/b43/xmit.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
index 4f38f19..6e6ef3f 100644
--- a/drivers/net/wireless/b43/xmit.c
+++ b/drivers/net/wireless/b43/xmit.c
@@ -811,9 +811,13 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
 		break;
 	case B43_PHYTYPE_G:
 		status.band = IEEE80211_BAND_2GHZ;
-		/* chanid is the radio channel cookie value as used
-		 * to tune the radio. */
-		status.freq = chanid + 2400;
+		/* Somewhere between 478.104 and 508.1084 firmware for G-PHY
+		 * has been modified to be compatible with N-PHY and others.
+		 */
+		if (dev->fw.rev >= 508)
+			status.freq = ieee80211_channel_to_frequency(chanid, status.band);
+		else
+			status.freq = chanid + 2400;
 		break;
 	case B43_PHYTYPE_N:
 	case B43_PHYTYPE_LP:
-- 
1.8.4.5


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [RFC: which stable kernels?] b43: fix frequency reported on G-PHY with /new/ firmware
  2014-06-12  7:28 [RFC: which stable kernels?] b43: fix frequency reported on G-PHY with /new/ firmware Rafał Miłecki
@ 2014-06-12  7:35 ` Emmanuel Grumbach
  2014-06-12  7:43   ` Arend van Spriel
  0 siblings, 1 reply; 4+ messages in thread
From: Emmanuel Grumbach @ 2014-06-12  7:35 UTC (permalink / raw)
  To: Rafał Miłecki; +Cc: linux-wireless, b43-dev, Aaro Koskinen

> ---
> This bug was there for years, however didn't cause any problems. It was
> exposed recently by the 3.15 release by the:
>
> commit 3afc2167f60a327a2c1e1e2600ef209a3c2b75b7
> Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> Date:   Tue Mar 4 16:50:13 2014 +0200
>
>     cfg80211/mac80211: ignore signal if the frame was heard on wrong channel
>
> Should we mark it for stable for 3.15 only? Or all olders kernels as well?

Up to you - my patch is in 3.15 only I think.

> ---
>  drivers/net/wireless/b43/xmit.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
> index 4f38f19..6e6ef3f 100644
> --- a/drivers/net/wireless/b43/xmit.c
> +++ b/drivers/net/wireless/b43/xmit.c
> @@ -811,9 +811,13 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
>                 break;
>         case B43_PHYTYPE_G:
>                 status.band = IEEE80211_BAND_2GHZ;
> -               /* chanid is the radio channel cookie value as used
> -                * to tune the radio. */
> -               status.freq = chanid + 2400;
> +               /* Somewhere between 478.104 and 508.1084 firmware for G-PHY
> +                * has been modified to be compatible with N-PHY and others.
> +                */
> +               if (dev->fw.rev >= 508)
> +                       status.freq = ieee80211_channel_to_frequency(chanid, status.band);
> +               else
> +                       status.freq = chanid + 2400;
>                 break;
>         case B43_PHYTYPE_N:
>         case B43_PHYTYPE_LP:
> --
> 1.8.4.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [RFC: which stable kernels?] b43: fix frequency reported on G-PHY with /new/ firmware
  2014-06-12  7:35 ` Emmanuel Grumbach
@ 2014-06-12  7:43   ` Arend van Spriel
  2014-06-12 12:43     ` Johannes Berg
  0 siblings, 1 reply; 4+ messages in thread
From: Arend van Spriel @ 2014-06-12  7:43 UTC (permalink / raw)
  To: Emmanuel Grumbach, Rafał Miłecki
  Cc: linux-wireless, b43-dev, Aaro Koskinen

On 12-06-14 09:35, Emmanuel Grumbach wrote:
>> ---
>> This bug was there for years, however didn't cause any problems. It was
>> exposed recently by the 3.15 release by the:
>>
>> commit 3afc2167f60a327a2c1e1e2600ef209a3c2b75b7
>> Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
>> Date:   Tue Mar 4 16:50:13 2014 +0200
>>
>>      cfg80211/mac80211: ignore signal if the frame was heard on wrong channel
>>
>> Should we mark it for stable for 3.15 only? Or all olders kernels as well?
>
> Up to you - my patch is in 3.15 only I think.

Is there any scenario that would expose the worng info. Maybe when using 
monitor mode?

Gr. AvS

>> ---
>>   drivers/net/wireless/b43/xmit.c | 10 +++++++---
>>   1 file changed, 7 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/net/wireless/b43/xmit.c b/drivers/net/wireless/b43/xmit.c
>> index 4f38f19..6e6ef3f 100644
>> --- a/drivers/net/wireless/b43/xmit.c
>> +++ b/drivers/net/wireless/b43/xmit.c
>> @@ -811,9 +811,13 @@ void b43_rx(struct b43_wldev *dev, struct sk_buff *skb, const void *_rxhdr)
>>                  break;
>>          case B43_PHYTYPE_G:
>>                  status.band = IEEE80211_BAND_2GHZ;
>> -               /* chanid is the radio channel cookie value as used
>> -                * to tune the radio. */
>> -               status.freq = chanid + 2400;
>> +               /* Somewhere between 478.104 and 508.1084 firmware for G-PHY
>> +                * has been modified to be compatible with N-PHY and others.
>> +                */
>> +               if (dev->fw.rev >= 508)
>> +                       status.freq = ieee80211_channel_to_frequency(chanid, status.band);
>> +               else
>> +                       status.freq = chanid + 2400;
>>                  break;
>>          case B43_PHYTYPE_N:
>>          case B43_PHYTYPE_LP:
>> --
>> 1.8.4.5
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [RFC: which stable kernels?] b43: fix frequency reported on G-PHY with /new/ firmware
  2014-06-12  7:43   ` Arend van Spriel
@ 2014-06-12 12:43     ` Johannes Berg
  0 siblings, 0 replies; 4+ messages in thread
From: Johannes Berg @ 2014-06-12 12:43 UTC (permalink / raw)
  To: Arend van Spriel
  Cc: Emmanuel Grumbach, Rafał Miłecki, linux-wireless,
	b43-dev, Aaro Koskinen

On Thu, 2014-06-12 at 09:43 +0200, Arend van Spriel wrote:
> On 12-06-14 09:35, Emmanuel Grumbach wrote:
> >> ---
> >> This bug was there for years, however didn't cause any problems. It was
> >> exposed recently by the 3.15 release by the:
> >>
> >> commit 3afc2167f60a327a2c1e1e2600ef209a3c2b75b7
> >> Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
> >> Date:   Tue Mar 4 16:50:13 2014 +0200
> >>
> >>      cfg80211/mac80211: ignore signal if the frame was heard on wrong channel
> >>
> >> Should we mark it for stable for 3.15 only? Or all olders kernels as well?
> >
> > Up to you - my patch is in 3.15 only I think.
> 
> Is there any scenario that would expose the worng info. Maybe when using 
> monitor mode?

Yeah that'd probably be messed up as well.

johannes


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-06-12 12:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-12  7:28 [RFC: which stable kernels?] b43: fix frequency reported on G-PHY with /new/ firmware Rafał Miłecki
2014-06-12  7:35 ` Emmanuel Grumbach
2014-06-12  7:43   ` Arend van Spriel
2014-06-12 12:43     ` Johannes Berg

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).