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
@@ -318,14 +318,14 @@ static void lbtf_op_stop(struct ieee80211_hw *hw)
|
||||
}
|
||||
|
||||
static int lbtf_op_add_interface(struct ieee80211_hw *hw,
|
||||
struct ieee80211_if_init_conf *conf)
|
||||
struct ieee80211_vif *vif)
|
||||
{
|
||||
struct lbtf_private *priv = hw->priv;
|
||||
if (priv->vif != NULL)
|
||||
return -EOPNOTSUPP;
|
||||
|
||||
priv->vif = conf->vif;
|
||||
switch (conf->type) {
|
||||
priv->vif = vif;
|
||||
switch (vif->type) {
|
||||
case NL80211_IFTYPE_MESH_POINT:
|
||||
case NL80211_IFTYPE_AP:
|
||||
lbtf_set_mode(priv, LBTF_AP_MODE);
|
||||
@@ -337,12 +337,12 @@ static int lbtf_op_add_interface(struct ieee80211_hw *hw,
|
||||
priv->vif = NULL;
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
lbtf_set_mac_address(priv, (u8 *) conf->mac_addr);
|
||||
lbtf_set_mac_address(priv, (u8 *) vif->addr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void lbtf_op_remove_interface(struct ieee80211_hw *hw,
|
||||
struct ieee80211_if_init_conf *conf)
|
||||
struct ieee80211_vif *vif)
|
||||
{
|
||||
struct lbtf_private *priv = hw->priv;
|
||||
|
||||
|
Reference in New Issue
Block a user