diff options
Diffstat (limited to 'drivers/net/wireless/rtl818x/rtl8180_dev.c')
-rw-r--r-- | drivers/net/wireless/rtl818x/rtl8180_dev.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c index f01f1ef9e3be..5a2b7199f5d5 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c | |||
@@ -652,7 +652,7 @@ static void rtl8180_stop(struct ieee80211_hw *dev) | |||
652 | } | 652 | } |
653 | 653 | ||
654 | static int rtl8180_add_interface(struct ieee80211_hw *dev, | 654 | static int rtl8180_add_interface(struct ieee80211_hw *dev, |
655 | struct ieee80211_if_init_conf *conf) | 655 | struct ieee80211_vif *vif) |
656 | { | 656 | { |
657 | struct rtl8180_priv *priv = dev->priv; | 657 | struct rtl8180_priv *priv = dev->priv; |
658 | 658 | ||
@@ -662,27 +662,27 @@ static int rtl8180_add_interface(struct ieee80211_hw *dev, | |||
662 | if (priv->vif) | 662 | if (priv->vif) |
663 | return -EBUSY; | 663 | return -EBUSY; |
664 | 664 | ||
665 | switch (conf->type) { | 665 | switch (vif->type) { |
666 | case NL80211_IFTYPE_STATION: | 666 | case NL80211_IFTYPE_STATION: |
667 | break; | 667 | break; |
668 | default: | 668 | default: |
669 | return -EOPNOTSUPP; | 669 | return -EOPNOTSUPP; |
670 | } | 670 | } |
671 | 671 | ||
672 | priv->vif = conf->vif; | 672 | priv->vif = vif; |
673 | 673 | ||
674 | rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG); | 674 | rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_CONFIG); |
675 | rtl818x_iowrite32(priv, (__le32 __iomem *)&priv->map->MAC[0], | 675 | rtl818x_iowrite32(priv, (__le32 __iomem *)&priv->map->MAC[0], |
676 | le32_to_cpu(*(__le32 *)conf->mac_addr)); | 676 | le32_to_cpu(*(__le32 *)vif->addr)); |
677 | rtl818x_iowrite16(priv, (__le16 __iomem *)&priv->map->MAC[4], | 677 | rtl818x_iowrite16(priv, (__le16 __iomem *)&priv->map->MAC[4], |
678 | le16_to_cpu(*(__le16 *)(conf->mac_addr + 4))); | 678 | le16_to_cpu(*(__le16 *)(vif->addr + 4))); |
679 | rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL); | 679 | rtl818x_iowrite8(priv, &priv->map->EEPROM_CMD, RTL818X_EEPROM_CMD_NORMAL); |
680 | 680 | ||
681 | return 0; | 681 | return 0; |
682 | } | 682 | } |
683 | 683 | ||
684 | static void rtl8180_remove_interface(struct ieee80211_hw *dev, | 684 | static void rtl8180_remove_interface(struct ieee80211_hw *dev, |
685 | struct ieee80211_if_init_conf *conf) | 685 | struct ieee80211_vif *vif) |
686 | { | 686 | { |
687 | struct rtl8180_priv *priv = dev->priv; | 687 | struct rtl8180_priv *priv = dev->priv; |
688 | priv->vif = NULL; | 688 | priv->vif = NULL; |