diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-21 13:13:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-21 13:13:04 -0700 |
| commit | 649bf17829d087f83754e2a8161e094a167ce3d3 (patch) | |
| tree | 81a493810224eaa6889acfdcb82f47d472b4ca92 | |
| parent | d3b325f9c25be6d504bc73afce7f92d0e25001d7 (diff) | |
| parent | 1a9937b7f07ab6e35515e32a7625f0ba50ab7670 (diff) | |
| download | op-kernel-dev-649bf17829d087f83754e2a8161e094a167ce3d3.zip op-kernel-dev-649bf17829d087f83754e2a8161e094a167ce3d3.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
| -rw-r--r-- | 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); } |
