diff options
| author | Andrea Merello <andrea.merello@gmail.com> | 2014-03-26 21:03:03 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-27 19:20:09 +0100 |
| commit | 355668d23a99acb45fefd7aeee8e0881e953e432 (patch) | |
| tree | 66e1861a9d04ffa4467b935430f8099b0e48770c /drivers/net/wireless/rtl818x | |
| parent | rtl8180: add rtl8187se HW initialization (diff) | |
| download | linux-355668d23a99acb45fefd7aeee8e0881e953e432.tar.xz linux-355668d23a99acb45fefd7aeee8e0881e953e432.zip | |
rtl8180: add ERP configuration for rtl8187se
This patch adds ERP configuration support for rtl8187se to the
existing ERP configuration function.
It needs a different register offset and it must not apply
rtl8185 workaround.
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 | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index 80618525ac78..6f9da01a9096 100644 --- a/drivers/net/wireless/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c @@ -1336,13 +1336,17 @@ static void rtl8180_conf_erp(struct ieee80211_hw *dev, /* from reference code. set ack timeout reg = eifs reg */ rtl818x_iowrite8(priv, &priv->map->CARRIER_SENSE_COUNTER, hw_eifs); - /* rtl8187/rtl8185 HW bug. After EIFS is elapsed, - * the HW still wait for DIFS. - * HW uses 4uS units for EIFS. - */ - hw_eifs = DIV_ROUND_UP(eifs - difs, 4); + if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8187SE) + rtl818x_iowrite8(priv, &priv->map->EIFS_8187SE, hw_eifs); + else if (priv->chip_family == RTL818X_CHIP_FAMILY_RTL8185) { + /* rtl8187/rtl8185 HW bug. After EIFS is elapsed, + * the HW still wait for DIFS. + * HW uses 4uS units for EIFS. + */ + hw_eifs = DIV_ROUND_UP(eifs - difs, 4); - rtl818x_iowrite8(priv, &priv->map->EIFS, hw_eifs); + rtl818x_iowrite8(priv, &priv->map->EIFS, hw_eifs); + } } static void rtl8180_bss_info_changed(struct ieee80211_hw *dev, |