mac80211: add driver ops wrappers
In order to later add tracing or verifications to the driver calls mac80211 makes, this patch adds static inline wrappers for all operations. All calls are now written as drv_<op>(local, ...); instead of local->ops-><op>(&local->hw, ...); Where necessary, the wrappers also do existence checking and return default values as appropriate. 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
2d0ddec5b2
commit
2448798133
@@ -26,6 +26,7 @@
|
||||
#include <net/rtnetlink.h>
|
||||
|
||||
#include "ieee80211_i.h"
|
||||
#include "driver-ops.h"
|
||||
#include "rate.h"
|
||||
#include "mesh.h"
|
||||
#include "wme.h"
|
||||
@@ -726,7 +727,7 @@ void ieee80211_set_wmm_default(struct ieee80211_sub_if_data *sdata)
|
||||
qparam.txop = 0;
|
||||
|
||||
for (i = 0; i < local_to_hw(local)->queues; i++)
|
||||
local->ops->conf_tx(local_to_hw(local), i, &qparam);
|
||||
drv_conf_tx(local, i, &qparam);
|
||||
}
|
||||
|
||||
void ieee80211_sta_def_wmm_params(struct ieee80211_sub_if_data *sdata,
|
||||
@@ -1000,7 +1001,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
|
||||
|
||||
/* restart hardware */
|
||||
if (local->open_count) {
|
||||
res = local->ops->start(hw);
|
||||
res = drv_start(local);
|
||||
|
||||
ieee80211_led_radio(local, hw->conf.radio_enabled);
|
||||
}
|
||||
@@ -1013,7 +1014,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
|
||||
conf.vif = &sdata->vif;
|
||||
conf.type = sdata->vif.type;
|
||||
conf.mac_addr = sdata->dev->dev_addr;
|
||||
res = local->ops->add_interface(hw, &conf);
|
||||
res = drv_add_interface(local, &conf);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1026,8 +1027,8 @@ int ieee80211_reconfig(struct ieee80211_local *local)
|
||||
struct ieee80211_sub_if_data,
|
||||
u.ap);
|
||||
|
||||
local->ops->sta_notify(hw, &sdata->vif,
|
||||
STA_NOTIFY_ADD, &sta->sta);
|
||||
drv_sta_notify(local, &sdata->vif, STA_NOTIFY_ADD,
|
||||
&sta->sta);
|
||||
}
|
||||
spin_unlock_irqrestore(&local->sta_lock, flags);
|
||||
}
|
||||
@@ -1045,8 +1046,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
|
||||
rcu_read_unlock();
|
||||
|
||||
/* setup RTS threshold */
|
||||
if (local->ops->set_rts_threshold)
|
||||
local->ops->set_rts_threshold(hw, hw->wiphy->rts_threshold);
|
||||
drv_set_rts_threshold(local, hw->wiphy->rts_threshold);
|
||||
|
||||
/* reconfigure hardware */
|
||||
ieee80211_hw_config(local, ~0);
|
||||
|
Reference in New Issue
Block a user