mac80211: implement support for cfg80211_ops->{get,set}_ringparam
[linux-2.6.git] / net / mac80211 / driver-ops.h
index d1f8a7c..9c0d62b 100644 (file)
@@ -5,9 +5,9 @@
 #include "ieee80211_i.h"
 #include "driver-trace.h"
 
-static inline int drv_tx(struct ieee80211_local *local, struct sk_buff *skb)
+static inline void drv_tx(struct ieee80211_local *local, struct sk_buff *skb)
 {
-       return local->ops->tx(&local->hw, skb);
+       local->ops->tx(&local->hw, skb);
 }
 
 static inline int drv_start(struct ieee80211_local *local)
@@ -16,10 +16,11 @@ 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;
 }
 
@@ -27,8 +28,9 @@ 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);
@@ -46,8 +48,23 @@ 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;
+}
+
+static inline int drv_change_interface(struct ieee80211_local *local,
+                                      struct ieee80211_sub_if_data *sdata,
+                                      enum nl80211_iftype type, bool p2p)
+{
+       int ret;
+
+       might_sleep();
+
+       trace_drv_change_interface(local, sdata, type, p2p);
+       ret = local->ops->change_interface(&local->hw, &sdata->vif, type, p2p);
+       trace_drv_return_int(local, ret);
        return ret;
 }
 
@@ -56,8 +73,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)
@@ -66,8 +84,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;
 }
 
@@ -78,22 +97,23 @@ 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);
 }
 
 static inline u64 drv_prepare_multicast(struct ieee80211_local *local,
-                                       int mc_count,
-                                       struct dev_addr_list *mc_list)
+                                       struct netdev_hw_addr_list *mc_list)
 {
        u64 ret = 0;
 
+       trace_drv_prepare_multicast(local, mc_list->count);
+
        if (local->ops->prepare_multicast)
-               ret = local->ops->prepare_multicast(&local->hw, mc_count,
-                                                   mc_list);
+               ret = local->ops->prepare_multicast(&local->hw, mc_list);
 
-       trace_drv_prepare_multicast(local, mc_count, ret);
+       trace_drv_return_u64(local, ret);
 
        return ret;
 }
@@ -105,19 +125,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;
 }
 
@@ -131,8 +153,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;
 }
 
@@ -147,21 +170,24 @@ 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,
+                             struct ieee80211_sub_if_data *sdata,
                              struct cfg80211_scan_request *req)
 {
        int ret;
 
        might_sleep();
 
-       ret = local->ops->hw_scan(&local->hw, req);
-       trace_drv_hw_scan(local, req, ret);
+       trace_drv_hw_scan(local, sdata, req);
+       ret = local->ops->hw_scan(&local->hw, &sdata->vif, req);
+       trace_drv_return_int(local, ret);
        return ret;
 }
 
@@ -169,18 +195,20 @@ 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,
@@ -205,6 +233,20 @@ static inline void drv_get_tkip_seq(struct ieee80211_local *local,
        trace_drv_get_tkip_seq(local, hw_key_idx, iv32, iv16);
 }
 
+static inline int drv_set_frag_threshold(struct ieee80211_local *local,
+                                       u32 value)
+{
+       int ret = 0;
+
+       might_sleep();
+
+       trace_drv_set_frag_threshold(local, value);
+       if (local->ops->set_frag_threshold)
+               ret = local->ops->set_frag_threshold(&local->hw, value);
+       trace_drv_return_int(local, ret);
+       return ret;
+}
+
 static inline int drv_set_rts_threshold(struct ieee80211_local *local,
                                        u32 value)
 {
@@ -212,9 +254,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;
 }
 
@@ -224,12 +267,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;
 }
 
@@ -238,9 +282,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,
@@ -251,13 +296,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);
-       else if (local->ops->sta_notify)
-               local->ops->sta_notify(&local->hw, &sdata->vif,
-                                       STA_NOTIFY_ADD, sta);
 
-       trace_drv_sta_add(local, sdata, sta, ret);
+       trace_drv_return_int(local, ret);
 
        return ret;
 }
@@ -268,13 +311,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);
-       else if (local->ops->sta_notify)
-               local->ops->sta_notify(&local->hw, &sdata->vif,
-                                       STA_NOTIFY_REMOVE, 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,
@@ -284,9 +325,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;
 }
 
@@ -296,9 +338,10 @@ 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;
 }
 
@@ -306,29 +349,32 @@ 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)
 {
-       int ret = 1;
+       int ret = 0; /* default unsuported op for less congestion */
 
        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;
 }
 
@@ -336,13 +382,20 @@ static inline int drv_ampdu_action(struct ieee80211_local *local,
                                   struct ieee80211_sub_if_data *sdata,
                                   enum ieee80211_ampdu_mlme_action action,
                                   struct ieee80211_sta *sta, u16 tid,
-                                  u16 *ssn)
+                                  u16 *ssn, u8 buf_size)
 {
        int ret = -EOPNOTSUPP;
+
+       might_sleep();
+
+       trace_drv_ampdu_action(local, sdata, action, sta, tid, ssn, buf_size);
+
        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);
+                                              sta, tid, ssn, buf_size);
+
+       trace_drv_return_int(local, ret);
+
        return ret;
 }
 
@@ -350,9 +403,14 @@ static inline int drv_get_survey(struct ieee80211_local *local, int idx,
                                struct survey_info *survey)
 {
        int ret = -EOPNOTSUPP;
-       if (local->ops->conf_tx)
+
+       trace_drv_get_survey(local, idx, survey);
+
+       if (local->ops->get_survey)
                ret = local->ops->get_survey(&local->hw, idx, survey);
-       /* trace_drv_get_survey(local, idx, survey, ret); */
+
+       trace_drv_return_int(local, ret);
+
        return ret;
 }
 
@@ -371,5 +429,127 @@ 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();
+
+       trace_drv_channel_switch(local, ch_switch);
+       local->ops->channel_switch(&local->hw, ch_switch);
+       trace_drv_return_void(local);
+}
+
+
+static inline int drv_set_antenna(struct ieee80211_local *local,
+                                 u32 tx_ant, u32 rx_ant)
+{
+       int ret = -EOPNOTSUPP;
+       might_sleep();
+       if (local->ops->set_antenna)
+               ret = local->ops->set_antenna(&local->hw, tx_ant, rx_ant);
+       trace_drv_set_antenna(local, tx_ant, rx_ant, ret);
+       return ret;
+}
+
+static inline int drv_get_antenna(struct ieee80211_local *local,
+                                 u32 *tx_ant, u32 *rx_ant)
+{
+       int ret = -EOPNOTSUPP;
+       might_sleep();
+       if (local->ops->get_antenna)
+               ret = local->ops->get_antenna(&local->hw, tx_ant, rx_ant);
+       trace_drv_get_antenna(local, *tx_ant, *rx_ant, ret);
+       return ret;
+}
+
+static inline int drv_remain_on_channel(struct ieee80211_local *local,
+                                       struct ieee80211_channel *chan,
+                                       enum nl80211_channel_type chantype,
+                                       unsigned int duration)
+{
+       int ret;
+
+       might_sleep();
+
+       trace_drv_remain_on_channel(local, chan, chantype, duration);
+       ret = local->ops->remain_on_channel(&local->hw, chan, chantype,
+                                           duration);
+       trace_drv_return_int(local, ret);
+
+       return ret;
+}
+
+static inline int drv_cancel_remain_on_channel(struct ieee80211_local *local)
+{
+       int ret;
+
+       might_sleep();
+
+       trace_drv_cancel_remain_on_channel(local);
+       ret = local->ops->cancel_remain_on_channel(&local->hw);
+       trace_drv_return_int(local, ret);
+
+       return ret;
+}
+
+static inline int drv_offchannel_tx(struct ieee80211_local *local,
+                                   struct sk_buff *skb,
+                                   struct ieee80211_channel *chan,
+                                   enum nl80211_channel_type channel_type,
+                                   unsigned int wait)
+{
+       int ret;
+
+       might_sleep();
+
+       trace_drv_offchannel_tx(local, skb, chan, channel_type, wait);
+       ret = local->ops->offchannel_tx(&local->hw, skb, chan,
+                                       channel_type, wait);
+       trace_drv_return_int(local, ret);
+
+       return ret;
+}
+
+static inline int drv_offchannel_tx_cancel_wait(struct ieee80211_local *local)
+{
+       int ret;
+
+       might_sleep();
+
+       trace_drv_offchannel_tx_cancel_wait(local);
+       ret = local->ops->offchannel_tx_cancel_wait(&local->hw);
+       trace_drv_return_int(local, ret);
+
+       return ret;
+}
+
+static inline int drv_set_ringparam(struct ieee80211_local *local,
+                                   u32 tx, u32 rx)
+{
+       int ret = -ENOTSUPP;
+
+       might_sleep();
+
+       trace_drv_set_ringparam(local, tx, rx);
+       if (local->ops->set_ringparam)
+               ret = local->ops->set_ringparam(&local->hw, tx, rx);
+       trace_drv_return_int(local, ret);
+
+       return ret;
+}
+
+static inline void drv_get_ringparam(struct ieee80211_local *local,
+                                    u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max)
+{
+       might_sleep();
+
+       trace_drv_get_ringparam(local, tx, tx_max, rx, rx_max);
+       if (local->ops->get_ringparam)
+               local->ops->get_ringparam(&local->hw, tx, tx_max, rx, rx_max);
+       trace_drv_return_void(local);
+}
+
 #endif /* __MAC80211_DRIVER_OPS */