diff options
Diffstat (limited to 'drivers/net/wireless/rtl818x/rtl8187/dev.c')
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8187/dev.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c index fd78df813a85..c981bcfb6cef 100644 --- a/drivers/net/wireless/rtl818x/rtl8187/dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c | |||
@@ -785,7 +785,7 @@ static int rtl8187b_init_hw(struct ieee80211_hw *dev) | |||
785 | rtl818x_iowrite16(priv, (__le16 *)0xFF34, 0x0FFF); | 785 | rtl818x_iowrite16(priv, (__le16 *)0xFF34, 0x0FFF); |
786 | 786 | ||
787 | reg = rtl818x_ioread8(priv, &priv->map->CW_CONF); | 787 | reg = rtl818x_ioread8(priv, &priv->map->CW_CONF); |
788 | reg |= RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT; | 788 | reg |= RTL818X_CW_CONF_PERPACKET_RETRY; |
789 | rtl818x_iowrite8(priv, &priv->map->CW_CONF, reg); | 789 | rtl818x_iowrite8(priv, &priv->map->CW_CONF, reg); |
790 | 790 | ||
791 | /* Auto Rate Fallback Register (ARFR): 1M-54M setting */ | 791 | /* Auto Rate Fallback Register (ARFR): 1M-54M setting */ |
@@ -943,8 +943,8 @@ static int rtl8187_start(struct ieee80211_hw *dev) | |||
943 | rtl818x_iowrite32(priv, &priv->map->RX_CONF, reg); | 943 | rtl818x_iowrite32(priv, &priv->map->RX_CONF, reg); |
944 | 944 | ||
945 | reg = rtl818x_ioread8(priv, &priv->map->TX_AGC_CTL); | 945 | reg = rtl818x_ioread8(priv, &priv->map->TX_AGC_CTL); |
946 | reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_GAIN_SHIFT; | 946 | reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_GAIN; |
947 | reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT; | 947 | reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL; |
948 | reg &= ~RTL818X_TX_AGC_CTL_FEEDBACK_ANT; | 948 | reg &= ~RTL818X_TX_AGC_CTL_FEEDBACK_ANT; |
949 | rtl818x_iowrite8(priv, &priv->map->TX_AGC_CTL, reg); | 949 | rtl818x_iowrite8(priv, &priv->map->TX_AGC_CTL, reg); |
950 | 950 | ||
@@ -986,13 +986,13 @@ static int rtl8187_start(struct ieee80211_hw *dev) | |||
986 | rtl818x_iowrite32(priv, &priv->map->RX_CONF, reg); | 986 | rtl818x_iowrite32(priv, &priv->map->RX_CONF, reg); |
987 | 987 | ||
988 | reg = rtl818x_ioread8(priv, &priv->map->CW_CONF); | 988 | reg = rtl818x_ioread8(priv, &priv->map->CW_CONF); |
989 | reg &= ~RTL818X_CW_CONF_PERPACKET_CW_SHIFT; | 989 | reg &= ~RTL818X_CW_CONF_PERPACKET_CW; |
990 | reg |= RTL818X_CW_CONF_PERPACKET_RETRY_SHIFT; | 990 | reg |= RTL818X_CW_CONF_PERPACKET_RETRY; |
991 | rtl818x_iowrite8(priv, &priv->map->CW_CONF, reg); | 991 | rtl818x_iowrite8(priv, &priv->map->CW_CONF, reg); |
992 | 992 | ||
993 | reg = rtl818x_ioread8(priv, &priv->map->TX_AGC_CTL); | 993 | reg = rtl818x_ioread8(priv, &priv->map->TX_AGC_CTL); |
994 | reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_GAIN_SHIFT; | 994 | reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_GAIN; |
995 | reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL_SHIFT; | 995 | reg &= ~RTL818X_TX_AGC_CTL_PERPACKET_ANTSEL; |
996 | reg &= ~RTL818X_TX_AGC_CTL_FEEDBACK_ANT; | 996 | reg &= ~RTL818X_TX_AGC_CTL_FEEDBACK_ANT; |
997 | rtl818x_iowrite8(priv, &priv->map->TX_AGC_CTL, reg); | 997 | rtl818x_iowrite8(priv, &priv->map->TX_AGC_CTL, reg); |
998 | 998 | ||