aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rt2x00/rt2x00mac.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00mac.c')
-rw-r--r--drivers/net/wireless/rt2x00/rt2x00mac.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index e99d167d7df..1d67bcd46bc 100644
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -181,7 +181,7 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
181 is_interface_present(intf)) 181 is_interface_present(intf))
182 return -ENOBUFS; 182 return -ENOBUFS;
183 183
184 intf->id = conf->if_id; 184 intf->id = conf->vif;
185 intf->type = conf->type; 185 intf->type = conf->type;
186 if (conf->type == IEEE80211_IF_TYPE_AP) 186 if (conf->type == IEEE80211_IF_TYPE_AP)
187 memcpy(&intf->bssid, conf->mac_addr, ETH_ALEN); 187 memcpy(&intf->bssid, conf->mac_addr, ETH_ALEN);
@@ -265,7 +265,8 @@ int rt2x00mac_config(struct ieee80211_hw *hw, struct ieee80211_conf *conf)
265} 265}
266EXPORT_SYMBOL_GPL(rt2x00mac_config); 266EXPORT_SYMBOL_GPL(rt2x00mac_config);
267 267
268int rt2x00mac_config_interface(struct ieee80211_hw *hw, int if_id, 268int rt2x00mac_config_interface(struct ieee80211_hw *hw,
269 struct ieee80211_vif *vif,
269 struct ieee80211_if_conf *conf) 270 struct ieee80211_if_conf *conf)
270{ 271{
271 struct rt2x00_dev *rt2x00dev = hw->priv; 272 struct rt2x00_dev *rt2x00dev = hw->priv;