Dave,
One more straggler for 2.6.31...without this rtl8187b devices simply
don't work. :-(
The patch is small and isolated to rtl8187. I think we should take
it for 2.6.31.
Please let me know if there are problems!
John
---
Patch available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/
---
The following changes since commit 08fdef99342955a62884fb5c49ab43431a1cafbf:
David S. Miller (1):
Merge branch 'master' of git://git.kernel.org/.../linville/wireless-2.6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
Herton Ronaldo Krzesinski (1):
rtl8187: always set MSR_LINK_ENEDCA flag with RTL8187B
drivers/net/wireless/rtl818x/rtl8187_dev.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c
index 294250e..87a9558 100644
--- a/drivers/net/wireless/rtl818x/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c
@@ -869,6 +869,9 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev)
priv->aifsn[3] = 3; /* AIFSN[AC_BE] */
rtl818x_iowrite8(priv, &priv->map->ACM_CONTROL, 0);
+ /* ENEDCA flag must always be set, transmit issues? */
+ rtl818x_iowrite8(priv, &priv->map->MSR, RTL818X_MSR_ENEDCA);
+
return 0;
}
@@ -1173,13 +1176,16 @@ static void rtl8187_bss_info_changed(struct ieee80211_hw *dev,
rtl818x_iowrite8(priv, &priv->map->BSSID[i],
info->bssid[i]);
+ if (priv->is_rtl8187b)
+ reg = RTL818X_MSR_ENEDCA;
+ else
+ reg = 0;
+
if (is_valid_ether_addr(info->bssid)) {
- reg = RTL818X_MSR_INFRA;
- if (priv->is_rtl8187b)
- reg |= RTL818X_MSR_ENEDCA;
+ reg |= RTL818X_MSR_INFRA;
rtl818x_iowrite8(priv, &priv->map->MSR, reg);
} else {
- reg = RTL818X_MSR_NO_LINK;
+ reg |= RTL818X_MSR_NO_LINK;
rtl818x_iowrite8(priv, &priv->map->MSR, reg);
}
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
John W. Linville wrote:
> Dave,
>
> One more straggler for 2.6.31...without this rtl8187b devices simply
> don't work. :-(
>
> The patch is small and isolated to rtl8187. I think we should take
> it for 2.6.31.
Note: This patch should fix Bugzilla #13960, which is a regression
since 2.6.30. The OP has not yet reported back, but it fixed the same
condition on my computer.
From: "John W. Linville" <[email protected]>
Date: Fri, 21 Aug 2009 13:03:25 -0400
> One more straggler for 2.6.31...without this rtl8187b devices simply
> don't work. :-(
>
> The patch is small and isolated to rtl8187. I think we should take
> it for 2.6.31.
>
> Please let me know if there are problems!
Pulled, and I'll push out to kernel.org after a test build.
Thanks!