diff options
Diffstat (limited to 'drivers/net/wireless/mwl8k.c')
-rw-r--r-- | drivers/net/wireless/mwl8k.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index 97a95decf9a8..c1c6ecd0c5b3 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
@@ -2835,7 +2835,7 @@ static void mwl8k_stop(struct ieee80211_hw *hw) | |||
2835 | } | 2835 | } |
2836 | 2836 | ||
2837 | static int mwl8k_add_interface(struct ieee80211_hw *hw, | 2837 | static int mwl8k_add_interface(struct ieee80211_hw *hw, |
2838 | struct ieee80211_if_init_conf *conf) | 2838 | struct ieee80211_vif *vif) |
2839 | { | 2839 | { |
2840 | struct mwl8k_priv *priv = hw->priv; | 2840 | struct mwl8k_priv *priv = hw->priv; |
2841 | struct mwl8k_vif *mwl8k_vif; | 2841 | struct mwl8k_vif *mwl8k_vif; |
@@ -2849,7 +2849,7 @@ static int mwl8k_add_interface(struct ieee80211_hw *hw, | |||
2849 | /* | 2849 | /* |
2850 | * We only support managed interfaces for now. | 2850 | * We only support managed interfaces for now. |
2851 | */ | 2851 | */ |
2852 | if (conf->type != NL80211_IFTYPE_STATION) | 2852 | if (vif->type != NL80211_IFTYPE_STATION) |
2853 | return -EINVAL; | 2853 | return -EINVAL; |
2854 | 2854 | ||
2855 | /* | 2855 | /* |
@@ -2865,24 +2865,24 @@ static int mwl8k_add_interface(struct ieee80211_hw *hw, | |||
2865 | } | 2865 | } |
2866 | 2866 | ||
2867 | /* Clean out driver private area */ | 2867 | /* Clean out driver private area */ |
2868 | mwl8k_vif = MWL8K_VIF(conf->vif); | 2868 | mwl8k_vif = MWL8K_VIF(vif); |
2869 | memset(mwl8k_vif, 0, sizeof(*mwl8k_vif)); | 2869 | memset(mwl8k_vif, 0, sizeof(*mwl8k_vif)); |
2870 | 2870 | ||
2871 | /* Set and save the mac address */ | 2871 | /* Set and save the mac address */ |
2872 | mwl8k_cmd_set_mac_addr(hw, conf->mac_addr); | 2872 | mwl8k_cmd_set_mac_addr(hw, vif->addr); |
2873 | memcpy(mwl8k_vif->mac_addr, conf->mac_addr, ETH_ALEN); | 2873 | memcpy(mwl8k_vif->mac_addr, vif->addr, ETH_ALEN); |
2874 | 2874 | ||
2875 | /* Set Initial sequence number to zero */ | 2875 | /* Set Initial sequence number to zero */ |
2876 | mwl8k_vif->seqno = 0; | 2876 | mwl8k_vif->seqno = 0; |
2877 | 2877 | ||
2878 | priv->vif = conf->vif; | 2878 | priv->vif = vif; |
2879 | priv->current_channel = NULL; | 2879 | priv->current_channel = NULL; |
2880 | 2880 | ||
2881 | return 0; | 2881 | return 0; |
2882 | } | 2882 | } |
2883 | 2883 | ||
2884 | static void mwl8k_remove_interface(struct ieee80211_hw *hw, | 2884 | static void mwl8k_remove_interface(struct ieee80211_hw *hw, |
2885 | struct ieee80211_if_init_conf *conf) | 2885 | struct ieee80211_vif *vif) |
2886 | { | 2886 | { |
2887 | struct mwl8k_priv *priv = hw->priv; | 2887 | struct mwl8k_priv *priv = hw->priv; |
2888 | 2888 | ||