[PATCH][3.16 MAYBE?] b43: don't warn about no 5 GHz support on 2.4 GHz devices

[PATCH][3.16 MAYBE?] b43: don't warn about no 5 GHz support on 2.4 GHz devices

[Rafał Miłecki]

This could be a bit confusing to see warning about lacking support for
5 GHz band if your device supports 2.4 GHz only.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
---
John: even I was quite confused to see this warning on my BCM5357. I
suspected b43 incorrectly detected my WiFi as 5 GHz capable. I think
that proposed behavior makes more sense.
Do you think it's OK/worth to take it for 3.16?
---
 drivers/net/wireless/b43/main.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 8aeef10..27dc343 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -5268,14 +5268,16 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
 	b43_supported_bands(dev, &have_2ghz_phy, &have_5ghz_phy);
 
 	/* We don't support 5 GHz on some PHYs yet */
-	switch (dev->phy.type) {
-	case B43_PHYTYPE_A:
-	case B43_PHYTYPE_G:
-	case B43_PHYTYPE_N:
-	case B43_PHYTYPE_LP:
-	case B43_PHYTYPE_HT:
-		b43warn(wl, "5 GHz band is unsupported on this PHY\n");
-		have_5ghz_phy = false;
+	if (have_5ghz_phy) {
+		switch (dev->phy.type) {
+		case B43_PHYTYPE_A:
+		case B43_PHYTYPE_G:
+		case B43_PHYTYPE_N:
+		case B43_PHYTYPE_LP:
+		case B43_PHYTYPE_HT:
+			b43warn(wl, "5 GHz band is unsupported on this PHY\n");
+			have_5ghz_phy = false;
+		}
 	}
 
 	if (!have_2ghz_phy && !have_5ghz_phy) {
-- 
1.8.4.5

Re: [PATCH][3.16 MAYBE?] b43: don't warn about no 5 GHz support on 2.4 GHz devices

[John W. Linville]

On Tue, Jul 08, 2014 at 09:00:19PM +0200, Rafał Miłecki wrote:
> This could be a bit confusing to see warning about lacking support for
> 5 GHz band if your device supports 2.4 GHz only.
> 
> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
> ---
> John: even I was quite confused to see this warning on my BCM5357. I
> suspected b43 incorrectly detected my WiFi as 5 GHz capable. I think
> that proposed behavior makes more sense.
> Do you think it's OK/worth to take it for 3.16?

I don't really think it merits prommotion to 3.16.  I am happy to
merge it for -next.

John
-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

Re: [PATCH][3.16 MAYBE?] b43: don't warn about no 5 GHz support on 2.4 GHz devices

[Rafał Miłecki]

On 15 July 2014 21:30, John W. Linville <linville@tuxdriver.com> wrote:
> On Tue, Jul 08, 2014 at 09:00:19PM +0200, Rafał Miłecki wrote:
>> This could be a bit confusing to see warning about lacking support for
>> 5 GHz band if your device supports 2.4 GHz only.
>>
>> Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
>> ---
>> John: even I was quite confused to see this warning on my BCM5357. I
>> suspected b43 incorrectly detected my WiFi as 5 GHz capable. I think
>> that proposed behavior makes more sense.
>> Do you think it's OK/worth to take it for 3.16?
>
> I don't really think it merits prommotion to 3.16.  I am happy to
> merge it for -next.

OK, no problem, thanks :)

-- 
Rafał