diff options
| author | Andrea Merello | 2014-06-30 18:17:48 +0200 |
|---|---|---|
| committer | John W. Linville | 2014-07-01 20:26:26 +0200 |
| commit | 1f622d76fa704bc67b4fbf0d72cc6c369112986c (patch) | |
| tree | 6f3312b20e1ca97dd597a4bd19909b33c1ee1855 /drivers/net/wireless/rtl818x | |
| parent | b43: treat LCNXN-PHY as extra N-PHY devices (diff) | |
| download | kernel-qcow2-linux-1f622d76fa704bc67b4fbf0d72cc6c369112986c.tar.gz kernel-qcow2-linux-1f622d76fa704bc67b4fbf0d72cc6c369112986c.tar.xz kernel-qcow2-linux-1f622d76fa704bc67b4fbf0d72cc6c369112986c.zip | |
rtl818x_pci: Fix BSSID register written incorrectly
BSSID register was written with six byte-writes.
It seems that, similarly to what happens with MAC registers, they needs to be
written with one 16-bit and one 32-bit writes, otherwise the write does not work.
The byte write didn't work only on my rtl8185, while it worked on rtl8180 and
rtl8187se, BTW since there are probably a number of different ASIC revisions out
of there, I let the change to affect all cards.
It shouldn't hurt anyway.
Signed-off-by: Andrea Merello <andrea.merello@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtl818x')
| -rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180/dev.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index 1e2592918fc6..e2dcedee5e41 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c @@ -1461,9 +1461,10 @@ static void rtl8180_bss_info_changed(struct ieee80211_hw *dev, vif_priv = (struct rtl8180_vif *)&vif->drv_priv; if (changed & BSS_CHANGED_BSSID) { - for (i = 0; i < ETH_ALEN; i++) - rtl818x_iowrite8(priv, &priv->map->BSSID[i], - info->bssid[i]); + rtl818x_iowrite16(priv, (__le16 __iomem *)&priv->map->BSSID[0], + le16_to_cpu(*(__le16 *)info->bssid)); + rtl818x_iowrite32(priv, (__le32 __iomem *)&priv->map->BSSID[2], + le32_to_cpu(*(__le32 *)(info->bssid + 2))); if (is_valid_ether_addr(info->bssid)) { if (vif->type == NL80211_IFTYPE_ADHOC) |