summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtl818x
diff options
context:
space:
mode:
authorAndrea Merello <andrea.merello@gmail.com>2014-03-26 20:59:25 +0100
committerJohn W. Linville <linville@tuxdriver.com>2014-03-27 19:20:07 +0100
commitd209f3b473e0135ee7d800b5fde50955dbdfc246 (patch)
tree2ba1aadce5438ac752b8328f9761c1bcb23d9ca4 /drivers/net/wireless/rtl818x
parentrtl8180: add rtl8187se fields to TX descriptor (diff)
downloadlinux-d209f3b473e0135ee7d800b5fde50955dbdfc246.tar.xz
linux-d209f3b473e0135ee7d800b5fde50955dbdfc246.zip
rtl8180: add basic rate configuration support for rtl8187se
Basic rate configuration is a bit different for rtl8187se. Adding this also fixes the gcc warning introduced in last patch about unhandled case in switch. 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.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c
index 767e1048f336..6b237ed15eed 100644
--- a/drivers/net/wireless/rtl818x/rtl8180/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8180/dev.c
@@ -412,7 +412,6 @@ static void rtl8180_conf_basic_rates(struct ieee80211_hw *dev,
reg &= ~3;
reg |= max;
rtl818x_iowrite16(priv, &priv->map->BRSR, reg);
-
break;
case RTL818X_CHIP_FAMILY_RTL8185:
@@ -420,6 +419,11 @@ static void rtl8180_conf_basic_rates(struct ieee80211_hw *dev,
rtl818x_iowrite16(priv, &priv->map->BRSR, rates_mask);
rtl818x_iowrite8(priv, &priv->map->RESP_RATE, (max << 4) | min);
break;
+
+ case RTL818X_CHIP_FAMILY_RTL8187SE:
+ /* in 8187se this is a BITMAP */
+ rtl818x_iowrite16(priv, &priv->map->BRSR_8187SE, rates_mask);
+ break;
}
}