diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-09-15 14:46:32 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-19 15:58:27 -0400 |
commit | 14991a9d8469ccac12c5d243e975d3ab78c8238a (patch) | |
tree | 362d38fb41764ccad9cfe8e1f79cbcbeec907927 | |
parent | 859cfb0a99369cf51dc2125ebc3476382a15c322 (diff) |
iwlagn: use enum iwl_rxon_context_id instead of u8
enum iwl_rxon_context_id is the right type to use when we need a
rxon_context_id.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.c | 5 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.h | 12 |
4 files changed, 17 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 208ca218d6b..90ab27e50e7 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -817,7 +817,8 @@ void iwl_chswitch_done(struct iwl_priv *priv, bool is_success) | |||
817 | } | 817 | } |
818 | 818 | ||
819 | #ifdef CONFIG_IWLWIFI_DEBUG | 819 | #ifdef CONFIG_IWLWIFI_DEBUG |
820 | void iwl_print_rx_config_cmd(struct iwl_priv *priv, u8 ctxid) | 820 | void iwl_print_rx_config_cmd(struct iwl_priv *priv, |
821 | enum iwl_rxon_context_id ctxid) | ||
821 | { | 822 | { |
822 | struct iwl_rxon_context *ctx = &priv->contexts[ctxid]; | 823 | struct iwl_rxon_context *ctx = &priv->contexts[ctxid]; |
823 | struct iwl_rxon_cmd *rxon = &ctx->staging; | 824 | struct iwl_rxon_cmd *rxon = &ctx->staging; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index 0f15d588303..36872f0c335 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h | |||
@@ -399,9 +399,11 @@ void iwl_reset_traffic_log(struct iwl_priv *priv); | |||
399 | #endif /* CONFIG_IWLWIFI_DEBUGFS */ | 399 | #endif /* CONFIG_IWLWIFI_DEBUGFS */ |
400 | 400 | ||
401 | #ifdef CONFIG_IWLWIFI_DEBUG | 401 | #ifdef CONFIG_IWLWIFI_DEBUG |
402 | void iwl_print_rx_config_cmd(struct iwl_priv *priv, u8 ctxid); | 402 | void iwl_print_rx_config_cmd(struct iwl_priv *priv, |
403 | enum iwl_rxon_context_id ctxid); | ||
403 | #else | 404 | #else |
404 | static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv, u8 ctxid) | 405 | static inline void iwl_print_rx_config_cmd(struct iwl_priv *priv, |
406 | enum iwl_rxon_context_id ctxid) | ||
405 | { | 407 | { |
406 | } | 408 | } |
407 | #endif | 409 | #endif |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.c b/drivers/net/wireless/iwlwifi/iwl-trans.c index 228c861848c..209dd7e16e9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans.c | |||
@@ -1041,7 +1041,8 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans) | |||
1041 | } | 1041 | } |
1042 | 1042 | ||
1043 | static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, | 1043 | static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb, |
1044 | struct iwl_device_cmd *dev_cmd, u8 ctx, u8 sta_id) | 1044 | struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx, |
1045 | u8 sta_id) | ||
1045 | { | 1046 | { |
1046 | struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); | 1047 | struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans); |
1047 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; | 1048 | struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; |
@@ -1413,7 +1414,7 @@ static int iwl_trans_pcie_resume(struct iwl_trans *trans) | |||
1413 | #endif /* CONFIG_PM */ | 1414 | #endif /* CONFIG_PM */ |
1414 | 1415 | ||
1415 | static void iwl_trans_pcie_wake_any_queue(struct iwl_trans *trans, | 1416 | static void iwl_trans_pcie_wake_any_queue(struct iwl_trans *trans, |
1416 | u8 ctx) | 1417 | enum iwl_rxon_context_id ctx) |
1417 | { | 1418 | { |
1418 | u8 ac, txq_id; | 1419 | u8 ac, txq_id; |
1419 | struct iwl_trans_pcie *trans_pcie = | 1420 | struct iwl_trans_pcie *trans_pcie = |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index 71a6fb05356..f067408356f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h | |||
@@ -178,14 +178,16 @@ struct iwl_trans_ops { | |||
178 | void (*stop_device)(struct iwl_trans *trans); | 178 | void (*stop_device)(struct iwl_trans *trans); |
179 | void (*tx_start)(struct iwl_trans *trans); | 179 | void (*tx_start)(struct iwl_trans *trans); |
180 | 180 | ||
181 | void (*wake_any_queue)(struct iwl_trans *trans, u8 ctx); | 181 | void (*wake_any_queue)(struct iwl_trans *trans, |
182 | enum iwl_rxon_context_id ctx); | ||
182 | 183 | ||
183 | int (*send_cmd)(struct iwl_trans *trans, struct iwl_host_cmd *cmd); | 184 | int (*send_cmd)(struct iwl_trans *trans, struct iwl_host_cmd *cmd); |
184 | 185 | ||
185 | int (*send_cmd_pdu)(struct iwl_trans *trans, u8 id, u32 flags, u16 len, | 186 | int (*send_cmd_pdu)(struct iwl_trans *trans, u8 id, u32 flags, u16 len, |
186 | const void *data); | 187 | const void *data); |
187 | int (*tx)(struct iwl_trans *trans, struct sk_buff *skb, | 188 | int (*tx)(struct iwl_trans *trans, struct sk_buff *skb, |
188 | struct iwl_device_cmd *dev_cmd, u8 ctx, u8 sta_id); | 189 | struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx, |
190 | u8 sta_id); | ||
189 | void (*reclaim)(struct iwl_trans *trans, int sta_id, int tid, | 191 | void (*reclaim)(struct iwl_trans *trans, int sta_id, int tid, |
190 | int txq_id, int ssn, u32 status, | 192 | int txq_id, int ssn, u32 status, |
191 | struct sk_buff_head *skbs); | 193 | struct sk_buff_head *skbs); |
@@ -255,7 +257,8 @@ static inline void iwl_trans_tx_start(struct iwl_trans *trans) | |||
255 | trans->ops->tx_start(trans); | 257 | trans->ops->tx_start(trans); |
256 | } | 258 | } |
257 | 259 | ||
258 | static inline void iwl_trans_wake_any_queue(struct iwl_trans *trans, u8 ctx) | 260 | static inline void iwl_trans_wake_any_queue(struct iwl_trans *trans, |
261 | enum iwl_rxon_context_id ctx) | ||
259 | { | 262 | { |
260 | trans->ops->wake_any_queue(trans, ctx); | 263 | trans->ops->wake_any_queue(trans, ctx); |
261 | } | 264 | } |
@@ -274,7 +277,8 @@ static inline int iwl_trans_send_cmd_pdu(struct iwl_trans *trans, u8 id, | |||
274 | } | 277 | } |
275 | 278 | ||
276 | static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb, | 279 | static inline int iwl_trans_tx(struct iwl_trans *trans, struct sk_buff *skb, |
277 | struct iwl_device_cmd *dev_cmd, u8 ctx, u8 sta_id) | 280 | struct iwl_device_cmd *dev_cmd, enum iwl_rxon_context_id ctx, |
281 | u8 sta_id) | ||
278 | { | 282 | { |
279 | return trans->ops->tx(trans, skb, dev_cmd, ctx, sta_id); | 283 | return trans->ops->tx(trans, skb, dev_cmd, ctx, sta_id); |
280 | } | 284 | } |