diff options
Diffstat (limited to 'drivers/net/wireless/adm8211.c')
-rw-r--r-- | drivers/net/wireless/adm8211.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 39410016b4ff..e1f04bb437e3 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
@@ -1400,15 +1400,15 @@ static void adm8211_configure_filter(struct ieee80211_hw *dev, | |||
1400 | } | 1400 | } |
1401 | 1401 | ||
1402 | static int adm8211_add_interface(struct ieee80211_hw *dev, | 1402 | static int adm8211_add_interface(struct ieee80211_hw *dev, |
1403 | struct ieee80211_if_init_conf *conf) | 1403 | struct ieee80211_vif *vif) |
1404 | { | 1404 | { |
1405 | struct adm8211_priv *priv = dev->priv; | 1405 | struct adm8211_priv *priv = dev->priv; |
1406 | if (priv->mode != NL80211_IFTYPE_MONITOR) | 1406 | if (priv->mode != NL80211_IFTYPE_MONITOR) |
1407 | return -EOPNOTSUPP; | 1407 | return -EOPNOTSUPP; |
1408 | 1408 | ||
1409 | switch (conf->type) { | 1409 | switch (vif->type) { |
1410 | case NL80211_IFTYPE_STATION: | 1410 | case NL80211_IFTYPE_STATION: |
1411 | priv->mode = conf->type; | 1411 | priv->mode = vif->type; |
1412 | break; | 1412 | break; |
1413 | default: | 1413 | default: |
1414 | return -EOPNOTSUPP; | 1414 | return -EOPNOTSUPP; |
@@ -1416,8 +1416,8 @@ static int adm8211_add_interface(struct ieee80211_hw *dev, | |||
1416 | 1416 | ||
1417 | ADM8211_IDLE(); | 1417 | ADM8211_IDLE(); |
1418 | 1418 | ||
1419 | ADM8211_CSR_WRITE(PAR0, le32_to_cpu(*(__le32 *)conf->mac_addr)); | 1419 | ADM8211_CSR_WRITE(PAR0, le32_to_cpu(*(__le32 *)vif->addr)); |
1420 | ADM8211_CSR_WRITE(PAR1, le16_to_cpu(*(__le16 *)(conf->mac_addr + 4))); | 1420 | ADM8211_CSR_WRITE(PAR1, le16_to_cpu(*(__le16 *)(vif->addr + 4))); |
1421 | 1421 | ||
1422 | adm8211_update_mode(dev); | 1422 | adm8211_update_mode(dev); |
1423 | 1423 | ||
@@ -1427,7 +1427,7 @@ static int adm8211_add_interface(struct ieee80211_hw *dev, | |||
1427 | } | 1427 | } |
1428 | 1428 | ||
1429 | static void adm8211_remove_interface(struct ieee80211_hw *dev, | 1429 | static void adm8211_remove_interface(struct ieee80211_hw *dev, |
1430 | struct ieee80211_if_init_conf *conf) | 1430 | struct ieee80211_vif *vif) |
1431 | { | 1431 | { |
1432 | struct adm8211_priv *priv = dev->priv; | 1432 | struct adm8211_priv *priv = dev->priv; |
1433 | priv->mode = NL80211_IFTYPE_MONITOR; | 1433 | priv->mode = NL80211_IFTYPE_MONITOR; |