diff options
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
-rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_main.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index 4a997381a8d0..e4867b895c43 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
@@ -1039,13 +1039,13 @@ static void wl1271_op_stop(struct ieee80211_hw *hw) | |||
1039 | } | 1039 | } |
1040 | 1040 | ||
1041 | static int wl1271_op_add_interface(struct ieee80211_hw *hw, | 1041 | static int wl1271_op_add_interface(struct ieee80211_hw *hw, |
1042 | struct ieee80211_if_init_conf *conf) | 1042 | struct ieee80211_vif *vif) |
1043 | { | 1043 | { |
1044 | struct wl1271 *wl = hw->priv; | 1044 | struct wl1271 *wl = hw->priv; |
1045 | int ret = 0; | 1045 | int ret = 0; |
1046 | 1046 | ||
1047 | wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM", | 1047 | wl1271_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM", |
1048 | conf->type, conf->mac_addr); | 1048 | vif->type, vif->addr); |
1049 | 1049 | ||
1050 | mutex_lock(&wl->mutex); | 1050 | mutex_lock(&wl->mutex); |
1051 | if (wl->vif) { | 1051 | if (wl->vif) { |
@@ -1053,9 +1053,9 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw, | |||
1053 | goto out; | 1053 | goto out; |
1054 | } | 1054 | } |
1055 | 1055 | ||
1056 | wl->vif = conf->vif; | 1056 | wl->vif = vif; |
1057 | 1057 | ||
1058 | switch (conf->type) { | 1058 | switch (vif->type) { |
1059 | case NL80211_IFTYPE_STATION: | 1059 | case NL80211_IFTYPE_STATION: |
1060 | wl->bss_type = BSS_TYPE_STA_BSS; | 1060 | wl->bss_type = BSS_TYPE_STA_BSS; |
1061 | break; | 1061 | break; |
@@ -1075,7 +1075,7 @@ out: | |||
1075 | } | 1075 | } |
1076 | 1076 | ||
1077 | static void wl1271_op_remove_interface(struct ieee80211_hw *hw, | 1077 | static void wl1271_op_remove_interface(struct ieee80211_hw *hw, |
1078 | struct ieee80211_if_init_conf *conf) | 1078 | struct ieee80211_vif *vif) |
1079 | { | 1079 | { |
1080 | struct wl1271 *wl = hw->priv; | 1080 | struct wl1271 *wl = hw->priv; |
1081 | 1081 | ||