cfg80211/nl80211: clarify TX queue API

[deliverable/linux.git] / net / mac80211 / driver-ops.h

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index af4691fed6457e4df103d3e27332a01b9b304f66..8ad40f68f2c34e72e7828a6f32ce85346ec2b452 100644 (file)
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -7,7 +7,9 @@
 
 static inline void check_sdata_in_driver(struct ieee80211_sub_if_data *sdata)
 {
-       WARN_ON(!(sdata->flags & IEEE80211_SDATA_IN_DRIVER));
+       WARN(!(sdata->flags & IEEE80211_SDATA_IN_DRIVER),
+            "%s:  Failed check-sdata-in-driver check, flags: 0x%x\n",
+            sdata->dev->name, sdata->flags);
 }
 
 static inline struct ieee80211_sub_if_data *
@@ -474,8 +476,23 @@ int drv_sta_state(struct ieee80211_local *local,
        return ret;
 }
 
+static inline void drv_sta_rc_update(struct ieee80211_local *local,
+                                    struct ieee80211_sub_if_data *sdata,
+                                    struct ieee80211_sta *sta, u32 changed)
+{
+       sdata = get_bss_sdata(sdata);
+       check_sdata_in_driver(sdata);
+
+       trace_drv_sta_rc_update(local, sdata, sta, changed);
+       if (local->ops->sta_rc_update)
+               local->ops->sta_rc_update(&local->hw, &sdata->vif,
+                                         sta, changed);
+
+       trace_drv_return_void(local);
+}
+
 static inline int drv_conf_tx(struct ieee80211_local *local,
-                             struct ieee80211_sub_if_data *sdata, u16 queue,
+                             struct ieee80211_sub_if_data *sdata, u16 ac,
                              const struct ieee80211_tx_queue_params *params)
 {
        int ret = -EOPNOTSUPP;
@@ -484,10 +501,10 @@ static inline int drv_conf_tx(struct ieee80211_local *local,
 
        check_sdata_in_driver(sdata);
 
-       trace_drv_conf_tx(local, sdata, queue, params);
+       trace_drv_conf_tx(local, sdata, ac, params);
        if (local->ops->conf_tx)
                ret = local->ops->conf_tx(&local->hw, &sdata->vif,
-                                         queue, params);
+                                         ac, params);
        trace_drv_return_int(local, ret);
        return ret;
 }