[drivers rtl8180] Update rtl8180 driver for aesthetic net80211 changes
authorJoshua Oreman <oremanj@xenon.get-linux.org>
Fri, 12 Jun 2009 02:48:16 +0000 (19:48 -0700)
committerJoshua Oreman <oremanj@xenon.get-linux.org>
Fri, 12 Jun 2009 02:48:16 +0000 (19:48 -0700)
src/drivers/net/rtl818x/rtl8180.c
src/drivers/net/rtl818x/rtl8180_rtl8225.c

index 2ab9211..e09002a 100644 (file)
@@ -551,7 +551,7 @@ static int rtl8180_config(struct net80211_device *dev, int changed)
                                        RTL818X_MSR_INFRA : RTL818X_MSR_NO_LINK);
        }
 
-       if (changed & NET80211_CFG_ERP_PARAMS)
+       if (changed & NET80211_CFG_PHY_PARAMS)
                priv->rf->conf_erp(dev);
 
        if (changed & NET80211_CFG_RATE) {
index 1391f83..067d73c 100644 (file)
@@ -780,7 +780,7 @@ static void rtl8225_rf_conf_erp(struct net80211_device *dev)
 {
        struct rtl8180_priv *priv = dev->priv;
 
-       if (dev->erp_flags & NET80211_ERP_USE_SHORT_SLOT) {
+       if (dev->phy_flags & NET80211_PHY_USE_SHORT_SLOT) {
                rtl818x_iowrite8(priv, &priv->map->SLOT, 0x9);
                rtl818x_iowrite8(priv, &priv->map->SIFS, 0x22);
                rtl818x_iowrite8(priv, &priv->map->DIFS, 0x14);