diff options
Diffstat (limited to 'drivers/net/wireless/ath/ar9170/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ar9170/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c index 20f04ab2b13e..4d27f7f67c76 100644 --- a/drivers/net/wireless/ath/ar9170/main.c +++ b/drivers/net/wireless/ath/ar9170/main.c | |||
@@ -1939,7 +1939,7 @@ err_free: | |||
1939 | } | 1939 | } |
1940 | 1940 | ||
1941 | static int ar9170_op_add_interface(struct ieee80211_hw *hw, | 1941 | static int ar9170_op_add_interface(struct ieee80211_hw *hw, |
1942 | struct ieee80211_if_init_conf *conf) | 1942 | struct ieee80211_vif *vif) |
1943 | { | 1943 | { |
1944 | struct ar9170 *ar = hw->priv; | 1944 | struct ar9170 *ar = hw->priv; |
1945 | struct ath_common *common = &ar->common; | 1945 | struct ath_common *common = &ar->common; |
@@ -1952,8 +1952,8 @@ static int ar9170_op_add_interface(struct ieee80211_hw *hw, | |||
1952 | goto unlock; | 1952 | goto unlock; |
1953 | } | 1953 | } |
1954 | 1954 | ||
1955 | ar->vif = conf->vif; | 1955 | ar->vif = vif; |
1956 | memcpy(common->macaddr, conf->mac_addr, ETH_ALEN); | 1956 | memcpy(common->macaddr, vif->addr, ETH_ALEN); |
1957 | 1957 | ||
1958 | if (modparam_nohwcrypt || (ar->vif->type != NL80211_IFTYPE_STATION)) { | 1958 | if (modparam_nohwcrypt || (ar->vif->type != NL80211_IFTYPE_STATION)) { |
1959 | ar->rx_software_decryption = true; | 1959 | ar->rx_software_decryption = true; |
@@ -1973,7 +1973,7 @@ unlock: | |||
1973 | } | 1973 | } |
1974 | 1974 | ||
1975 | static void ar9170_op_remove_interface(struct ieee80211_hw *hw, | 1975 | static void ar9170_op_remove_interface(struct ieee80211_hw *hw, |
1976 | struct ieee80211_if_init_conf *conf) | 1976 | struct ieee80211_vif *vif) |
1977 | { | 1977 | { |
1978 | struct ar9170 *ar = hw->priv; | 1978 | struct ar9170 *ar = hw->priv; |
1979 | 1979 | ||