mac80211: remove struct ieee80211_if_init_conf
All its members (vif, mac_addr, type) are now available in the vif struct directly, so we can pass that instead of the conf struct. I generated this patch (except the mac80211 and header file changes) with this semantic patch: @@ identifier conf, fn, hw; type tp; @@ tp fn(struct ieee80211_hw *hw, -struct ieee80211_if_init_conf *conf) +struct ieee80211_vif *vif) { <... ( -conf->type +vif->type | -conf->mac_addr +vif->addr | -conf->vif +vif ) ...> } Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:

committed by
John W. Linville

parent
98b6218388
commit
1ed32e4fc8
@@ -1939,7 +1939,7 @@ err_free:
|
||||
}
|
||||
|
||||
static int ar9170_op_add_interface(struct ieee80211_hw *hw,
|
||||
struct ieee80211_if_init_conf *conf)
|
||||
struct ieee80211_vif *vif)
|
||||
{
|
||||
struct ar9170 *ar = hw->priv;
|
||||
struct ath_common *common = &ar->common;
|
||||
@@ -1952,8 +1952,8 @@ static int ar9170_op_add_interface(struct ieee80211_hw *hw,
|
||||
goto unlock;
|
||||
}
|
||||
|
||||
ar->vif = conf->vif;
|
||||
memcpy(common->macaddr, conf->mac_addr, ETH_ALEN);
|
||||
ar->vif = vif;
|
||||
memcpy(common->macaddr, vif->addr, ETH_ALEN);
|
||||
|
||||
if (modparam_nohwcrypt || (ar->vif->type != NL80211_IFTYPE_STATION)) {
|
||||
ar->rx_software_decryption = true;
|
||||
@@ -1973,7 +1973,7 @@ unlock:
|
||||
}
|
||||
|
||||
static void ar9170_op_remove_interface(struct ieee80211_hw *hw,
|
||||
struct ieee80211_if_init_conf *conf)
|
||||
struct ieee80211_vif *vif)
|
||||
{
|
||||
struct ar9170 *ar = hw->priv;
|
||||
|
||||
|
Reference in New Issue
Block a user