From 2d6bd2d9303a1384ca770cff8fcfee04321c1e8c Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 24 Dec 2008 15:26:40 +0100 Subject: [PATCH] --- yaml --- r: 134059 b: refs/heads/master c: bb519bee07eed4fac9921ad658fb1f7ed78defb5 h: refs/heads/master i: 134057: 029dcbb35c00ebc2265d92f58dd3fd478b4980b3 134055: f5ed85d2f1fd73ea0ee041d10c6313ad603eff10 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/b43/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e5d437593bc3..81ae16c17674 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb33c4126ba9825b047463352d12dc3ed983d320 +refs/heads/master: bb519bee07eed4fac9921ad658fb1f7ed78defb5 diff --git a/trunk/drivers/net/wireless/b43/main.c b/trunk/drivers/net/wireless/b43/main.c index a2b1e375f83c..26e733a5a56e 100644 --- a/trunk/drivers/net/wireless/b43/main.c +++ b/trunk/drivers/net/wireless/b43/main.c @@ -3752,7 +3752,7 @@ static int b43_phy_versioning(struct b43_wldev *dev) break; #ifdef CONFIG_B43_NPHY case B43_PHYTYPE_N: - if (phy_rev > 1) + if (phy_rev > 4) unsupported = 1; break; #endif @@ -3805,7 +3805,7 @@ static int b43_phy_versioning(struct b43_wldev *dev) unsupported = 1; break; case B43_PHYTYPE_N: - if (radio_ver != 0x2055) + if (radio_ver != 0x2055 && radio_ver != 0x2056) unsupported = 1; break; default: