aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/zd1211rw')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_mac.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 8a243732c519..c4f41d0016c5 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -872,7 +872,7 @@ int zd_mac_rx(struct ieee80211_hw *hw, const u8 *buffer, unsigned int length)
872} 872}
873 873
874static int zd_op_add_interface(struct ieee80211_hw *hw, 874static int zd_op_add_interface(struct ieee80211_hw *hw,
875 struct ieee80211_if_init_conf *conf) 875 struct ieee80211_vif *vif)
876{ 876{
877 struct zd_mac *mac = zd_hw_mac(hw); 877 struct zd_mac *mac = zd_hw_mac(hw);
878 878
@@ -880,22 +880,22 @@ static int zd_op_add_interface(struct ieee80211_hw *hw,
880 if (mac->type != NL80211_IFTYPE_UNSPECIFIED) 880 if (mac->type != NL80211_IFTYPE_UNSPECIFIED)
881 return -EOPNOTSUPP; 881 return -EOPNOTSUPP;
882 882
883 switch (conf->type) { 883 switch (vif->type) {
884 case NL80211_IFTYPE_MONITOR: 884 case NL80211_IFTYPE_MONITOR:
885 case NL80211_IFTYPE_MESH_POINT: 885 case NL80211_IFTYPE_MESH_POINT:
886 case NL80211_IFTYPE_STATION: 886 case NL80211_IFTYPE_STATION:
887 case NL80211_IFTYPE_ADHOC: 887 case NL80211_IFTYPE_ADHOC:
888 mac->type = conf->type; 888 mac->type = vif->type;
889 break; 889 break;
890 default: 890 default:
891 return -EOPNOTSUPP; 891 return -EOPNOTSUPP;
892 } 892 }
893 893
894 return zd_write_mac_addr(&mac->chip, conf->mac_addr); 894 return zd_write_mac_addr(&mac->chip, vif->addr);
895} 895}
896 896
897static void zd_op_remove_interface(struct ieee80211_hw *hw, 897static void zd_op_remove_interface(struct ieee80211_hw *hw,
898 struct ieee80211_if_init_conf *conf) 898 struct ieee80211_vif *vif)
899{ 899{
900 struct zd_mac *mac = zd_hw_mac(hw); 900 struct zd_mac *mac = zd_hw_mac(hw);
901 mac->type = NL80211_IFTYPE_UNSPECIFIED; 901 mac->type = NL80211_IFTYPE_UNSPECIFIED;