1 files changed, 11 insertions, 3 deletions

diff --git a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c b/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
index cd22781728a..4d2be0d9672 100644
--- a/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
+++ b/drivers/net/wireless/rtl818x/rtl8180_rtl8225.c
@@ -725,8 +725,14 @@ static void rtl8225_rf_set_channel(struct ieee80211_hw *dev,
 
         rtl8225_write(dev, 0x7, rtl8225_chan[chan - 1]);
         msleep(10);
+}
+
+static void rtl8225_rf_conf_erp(struct ieee80211_hw *dev,
+                                struct ieee80211_bss_conf *info)
+{
+        struct rtl8180_priv *priv = dev->priv;
 
-        if (conf->flags & IEEE80211_CONF_SHORT_SLOT_TIME) {
+        if (info->use_short_slot) {
                 rtl818x_iowrite8(priv, &priv->map->SLOT, 0x9);
                 rtl818x_iowrite8(priv, &priv->map->SIFS, 0x22);
                 rtl818x_iowrite8(priv, &priv->map->DIFS, 0x14);
@@ -745,14 +751,16 @@ static const struct rtl818x_rf_ops rtl8225_ops = {
         .name           = "rtl8225",
         .init           = rtl8225_rf_init,
         .stop           = rtl8225_rf_stop,
-        .set_chan       = rtl8225_rf_set_channel
+        .set_chan       = rtl8225_rf_set_channel,
+        .conf_erp       = rtl8225_rf_conf_erp,
 };
 
 static const struct rtl818x_rf_ops rtl8225z2_ops = {
         .name           = "rtl8225z2",
         .init           = rtl8225z2_rf_init,
         .stop           = rtl8225_rf_stop,
-        .set_chan       = rtl8225_rf_set_channel
+        .set_chan       = rtl8225_rf_set_channel,
+        .conf_erp       = rtl8225_rf_conf_erp,
 };
 
 const struct rtl818x_rf_ops * rtl8180_detect_rf(struct ieee80211_hw *dev)