Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 203018
b: refs/heads/master
c: 4efc76b
h: refs/heads/master
v: v3
  • Loading branch information
Johannes Berg authored and John W. Linville committed Jun 14, 2010
1 parent 119e897 commit a7ebb39
Show file tree
Hide file tree
Showing 3 changed files with 157 additions and 123 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8b58ff832df9222e1fb3c58ae7f745f95569b55e
refs/heads/master: 4efc76bdbf9bfd2b8624c4dd52b9d8ffed176b31
89 changes: 59 additions & 30 deletions trunk/net/mac80211/driver-ops.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,21 @@ static inline int drv_start(struct ieee80211_local *local)

might_sleep();

trace_drv_start(local);
local->started = true;
smp_mb();
ret = local->ops->start(&local->hw);
trace_drv_start(local, ret);
trace_drv_return_int(local, ret);
return ret;
}

static inline void drv_stop(struct ieee80211_local *local)
{
might_sleep();

local->ops->stop(&local->hw);
trace_drv_stop(local);
local->ops->stop(&local->hw);
trace_drv_return_void(local);

/* sync away all work on the tasklet before clearing started */
tasklet_disable(&local->tasklet);
Expand All @@ -46,8 +48,9 @@ static inline int drv_add_interface(struct ieee80211_local *local,

might_sleep();

trace_drv_add_interface(local, vif_to_sdata(vif));
ret = local->ops->add_interface(&local->hw, vif);
trace_drv_add_interface(local, vif_to_sdata(vif), ret);
trace_drv_return_int(local, ret);
return ret;
}

Expand All @@ -56,8 +59,9 @@ static inline void drv_remove_interface(struct ieee80211_local *local,
{
might_sleep();

local->ops->remove_interface(&local->hw, vif);
trace_drv_remove_interface(local, vif_to_sdata(vif));
local->ops->remove_interface(&local->hw, vif);
trace_drv_return_void(local);
}

static inline int drv_config(struct ieee80211_local *local, u32 changed)
Expand All @@ -66,8 +70,9 @@ static inline int drv_config(struct ieee80211_local *local, u32 changed)

might_sleep();

trace_drv_config(local, changed);
ret = local->ops->config(&local->hw, changed);
trace_drv_config(local, changed, ret);
trace_drv_return_int(local, ret);
return ret;
}

Expand All @@ -78,9 +83,10 @@ static inline void drv_bss_info_changed(struct ieee80211_local *local,
{
might_sleep();

trace_drv_bss_info_changed(local, sdata, info, changed);
if (local->ops->bss_info_changed)
local->ops->bss_info_changed(&local->hw, &sdata->vif, info, changed);
trace_drv_bss_info_changed(local, sdata, info, changed);
trace_drv_return_void(local);
}

struct in_ifaddr;
Expand All @@ -92,11 +98,11 @@ static inline int drv_configure_arp_filter(struct ieee80211_local *local,

might_sleep();

trace_drv_configure_arp_filter(local, vif_to_sdata(vif));
if (local->ops->configure_arp_filter)
ret = local->ops->configure_arp_filter(&local->hw, vif,
ifa_list);

trace_drv_configure_arp_filter(local, vif_to_sdata(vif), ifa_list, ret);
trace_drv_return_int(local, ret);
return ret;
}

Expand All @@ -105,10 +111,12 @@ static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
{
u64 ret = 0;

trace_drv_prepare_multicast(local, mc_list->count);

if (local->ops->prepare_multicast)
ret = local->ops->prepare_multicast(&local->hw, mc_list);

trace_drv_prepare_multicast(local, mc_list->count, ret);
trace_drv_return_u64(local, ret);

return ret;
}
Expand All @@ -120,19 +128,21 @@ static inline void drv_configure_filter(struct ieee80211_local *local,
{
might_sleep();

local->ops->configure_filter(&local->hw, changed_flags, total_flags,
multicast);
trace_drv_configure_filter(local, changed_flags, total_flags,
multicast);
local->ops->configure_filter(&local->hw, changed_flags, total_flags,
multicast);
trace_drv_return_void(local);
}

static inline int drv_set_tim(struct ieee80211_local *local,
struct ieee80211_sta *sta, bool set)
{
int ret = 0;
trace_drv_set_tim(local, sta, set);
if (local->ops->set_tim)
ret = local->ops->set_tim(&local->hw, sta, set);
trace_drv_set_tim(local, sta, set, ret);
trace_drv_return_int(local, ret);
return ret;
}

Expand All @@ -146,8 +156,9 @@ static inline int drv_set_key(struct ieee80211_local *local,

might_sleep();

trace_drv_set_key(local, cmd, sdata, sta, key);
ret = local->ops->set_key(&local->hw, cmd, &sdata->vif, sta, key);
trace_drv_set_key(local, cmd, sdata, sta, key, ret);
trace_drv_return_int(local, ret);
return ret;
}

Expand All @@ -162,10 +173,11 @@ static inline void drv_update_tkip_key(struct ieee80211_local *local,
if (sta)
ista = &sta->sta;

trace_drv_update_tkip_key(local, sdata, conf, ista, iv32);
if (local->ops->update_tkip_key)
local->ops->update_tkip_key(&local->hw, &sdata->vif, conf,
ista, iv32, phase1key);
trace_drv_update_tkip_key(local, sdata, conf, ista, iv32);
trace_drv_return_void(local);
}

static inline int drv_hw_scan(struct ieee80211_local *local,
Expand All @@ -176,27 +188,30 @@ static inline int drv_hw_scan(struct ieee80211_local *local,

might_sleep();

trace_drv_hw_scan(local, sdata, req);
ret = local->ops->hw_scan(&local->hw, &sdata->vif, req);
trace_drv_hw_scan(local, sdata, req, ret);
trace_drv_return_int(local, ret);
return ret;
}

static inline void drv_sw_scan_start(struct ieee80211_local *local)
{
might_sleep();

trace_drv_sw_scan_start(local);
if (local->ops->sw_scan_start)
local->ops->sw_scan_start(&local->hw);
trace_drv_sw_scan_start(local);
trace_drv_return_void(local);
}

static inline void drv_sw_scan_complete(struct ieee80211_local *local)
{
might_sleep();

trace_drv_sw_scan_complete(local);
if (local->ops->sw_scan_complete)
local->ops->sw_scan_complete(&local->hw);
trace_drv_sw_scan_complete(local);
trace_drv_return_void(local);
}

static inline int drv_get_stats(struct ieee80211_local *local,
Expand Down Expand Up @@ -228,9 +243,10 @@ static inline int drv_set_rts_threshold(struct ieee80211_local *local,

might_sleep();

trace_drv_set_rts_threshold(local, value);
if (local->ops->set_rts_threshold)
ret = local->ops->set_rts_threshold(&local->hw, value);
trace_drv_set_rts_threshold(local, value, ret);
trace_drv_return_int(local, ret);
return ret;
}

Expand All @@ -240,12 +256,13 @@ static inline int drv_set_coverage_class(struct ieee80211_local *local,
int ret = 0;
might_sleep();

trace_drv_set_coverage_class(local, value);
if (local->ops->set_coverage_class)
local->ops->set_coverage_class(&local->hw, value);
else
ret = -EOPNOTSUPP;

trace_drv_set_coverage_class(local, value, ret);
trace_drv_return_int(local, ret);
return ret;
}

Expand All @@ -254,9 +271,10 @@ static inline void drv_sta_notify(struct ieee80211_local *local,
enum sta_notify_cmd cmd,
struct ieee80211_sta *sta)
{
trace_drv_sta_notify(local, sdata, cmd, sta);
if (local->ops->sta_notify)
local->ops->sta_notify(&local->hw, &sdata->vif, cmd, sta);
trace_drv_sta_notify(local, sdata, cmd, sta);
trace_drv_return_void(local);
}

static inline int drv_sta_add(struct ieee80211_local *local,
Expand All @@ -267,10 +285,11 @@ static inline int drv_sta_add(struct ieee80211_local *local,

might_sleep();

trace_drv_sta_add(local, sdata, sta);
if (local->ops->sta_add)
ret = local->ops->sta_add(&local->hw, &sdata->vif, sta);

trace_drv_sta_add(local, sdata, sta, ret);
trace_drv_return_int(local, ret);

return ret;
}
Expand All @@ -281,10 +300,11 @@ static inline void drv_sta_remove(struct ieee80211_local *local,
{
might_sleep();

trace_drv_sta_remove(local, sdata, sta);
if (local->ops->sta_remove)
local->ops->sta_remove(&local->hw, &sdata->vif, sta);

trace_drv_sta_remove(local, sdata, sta);
trace_drv_return_void(local);
}

static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue,
Expand All @@ -294,9 +314,10 @@ static inline int drv_conf_tx(struct ieee80211_local *local, u16 queue,

might_sleep();

trace_drv_conf_tx(local, queue, params);
if (local->ops->conf_tx)
ret = local->ops->conf_tx(&local->hw, queue, params);
trace_drv_conf_tx(local, queue, params, ret);
trace_drv_return_int(local, ret);
return ret;
}

Expand All @@ -306,28 +327,31 @@ static inline u64 drv_get_tsf(struct ieee80211_local *local)

might_sleep();

trace_drv_get_tsf(local);
if (local->ops->get_tsf)
ret = local->ops->get_tsf(&local->hw);
trace_drv_get_tsf(local, ret);
trace_drv_return_u64(local, ret);
return ret;
}

static inline void drv_set_tsf(struct ieee80211_local *local, u64 tsf)
{
might_sleep();

trace_drv_set_tsf(local, tsf);
if (local->ops->set_tsf)
local->ops->set_tsf(&local->hw, tsf);
trace_drv_set_tsf(local, tsf);
trace_drv_return_void(local);
}

static inline void drv_reset_tsf(struct ieee80211_local *local)
{
might_sleep();

trace_drv_reset_tsf(local);
if (local->ops->reset_tsf)
local->ops->reset_tsf(&local->hw);
trace_drv_reset_tsf(local);
trace_drv_return_void(local);
}

static inline int drv_tx_last_beacon(struct ieee80211_local *local)
Expand All @@ -336,9 +360,10 @@ static inline int drv_tx_last_beacon(struct ieee80211_local *local)

might_sleep();

trace_drv_tx_last_beacon(local);
if (local->ops->tx_last_beacon)
ret = local->ops->tx_last_beacon(&local->hw);
trace_drv_tx_last_beacon(local, ret);
trace_drv_return_int(local, ret);
return ret;
}

Expand All @@ -352,11 +377,14 @@ static inline int drv_ampdu_action(struct ieee80211_local *local,

might_sleep();

trace_drv_ampdu_action(local, sdata, action, sta, tid, ssn);

if (local->ops->ampdu_action)
ret = local->ops->ampdu_action(&local->hw, &sdata->vif, action,
sta, tid, ssn);

trace_drv_ampdu_action(local, sdata, action, sta, tid, ssn, ret);
trace_drv_return_int(local, ret);

return ret;
}

Expand Down Expand Up @@ -385,16 +413,17 @@ static inline void drv_flush(struct ieee80211_local *local, bool drop)
trace_drv_flush(local, drop);
if (local->ops->flush)
local->ops->flush(&local->hw, drop);
trace_drv_return_void(local);
}

static inline void drv_channel_switch(struct ieee80211_local *local,
struct ieee80211_channel_switch *ch_switch)
{
might_sleep();

local->ops->channel_switch(&local->hw, ch_switch);

trace_drv_channel_switch(local, ch_switch);
local->ops->channel_switch(&local->hw, ch_switch);
trace_drv_return_void(local);
}

#endif /* __MAC80211_DRIVER_OPS */
Loading

0 comments on commit a7ebb39

Please sign in to comment.