From: Andrea Merello Date: Wed, 26 Mar 2014 19:59:25 +0000 (+0100) Subject: rtl8180: add basic rate configuration support for rtl8187se X-Git-Tag: v3.15-rc1~113^2~18^2^2~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d209f3b473e0135ee7d800b5fde50955dbdfc246;p=platform%2Fkernel%2Flinux-exynos.git 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 Signed-off-by: John W. Linville --- diff --git a/drivers/net/wireless/rtl818x/rtl8180/dev.c b/drivers/net/wireless/rtl818x/rtl8180/dev.c index 767e104..6b237ed 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; } }