From 02c869449918b51b63eeb234d353daa07802af55 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 30 Apr 2010 11:30:44 -0700 Subject: [PATCH] --- yaml --- r: 195225 b: refs/heads/master c: 64ba9a54c60990416c4098c63792c37d8fccb9e1 h: refs/heads/master i: 195223: d9df2b0acf6119f3b334ecef88cbf651b128b0af v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-sta.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4bfc34f00141..cc01fa682a32 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd1af15d0a82ae681ecf34192150e27455c9c494 +refs/heads/master: 64ba9a54c60990416c4098c63792c37d8fccb9e1 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-sta.h b/trunk/drivers/net/wireless/iwlwifi/iwl-sta.h index 8efb83d6cf5c..7229e2c0f770 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-sta.h +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-sta.h @@ -84,4 +84,12 @@ int iwl_sta_rx_agg_start(struct iwl_priv *priv, int iwl_sta_rx_agg_stop(struct iwl_priv *priv, const u8 *addr, int tid); void iwl_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id); void iwl_sta_modify_sleep_tx_count(struct iwl_priv *priv, int sta_id, int cnt); + +static inline int iwl_sta_id(struct ieee80211_sta *sta) +{ + if (WARN_ON(!sta)) + return IWL_INVALID_STATION; + + return ((struct iwl_station_priv_common *)sta->drv_priv)->sta_id; +} #endif /* __iwl_sta_h__ */