aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index b07d397ed5a7..143c12a29fd8 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -4196,6 +4196,28 @@ static int iwl_set_hw_params(struct iwl_priv *priv)
4196 return priv->cfg->ops->lib->set_hw_params(priv); 4196 return priv->cfg->ops->lib->set_hw_params(priv);
4197} 4197}
4198 4198
4199static const u8 iwlagn_bss_ac_to_fifo[] = {
4200 IWL_TX_FIFO_VO,
4201 IWL_TX_FIFO_VI,
4202 IWL_TX_FIFO_BE,
4203 IWL_TX_FIFO_BK,
4204};
4205
4206static const u8 iwlagn_bss_ac_to_queue[] = {
4207 0, 1, 2, 3,
4208};
4209
4210static const u8 iwlagn_pan_ac_to_fifo[] = {
4211 IWL_TX_FIFO_VO_IPAN,
4212 IWL_TX_FIFO_VI_IPAN,
4213 IWL_TX_FIFO_BE_IPAN,
4214 IWL_TX_FIFO_BK_IPAN,
4215};
4216
4217static const u8 iwlagn_pan_ac_to_queue[] = {
4218 7, 6, 5, 4,
4219};
4220
4199static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 4221static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
4200{ 4222{
4201 int err = 0, i; 4223 int err = 0, i;
@@ -4242,6 +4264,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
4242 priv->contexts[IWL_RXON_CTX_BSS].qos_cmd = REPLY_QOS_PARAM; 4264 priv->contexts[IWL_RXON_CTX_BSS].qos_cmd = REPLY_QOS_PARAM;
4243 priv->contexts[IWL_RXON_CTX_BSS].ap_sta_id = IWL_AP_ID; 4265 priv->contexts[IWL_RXON_CTX_BSS].ap_sta_id = IWL_AP_ID;
4244 priv->contexts[IWL_RXON_CTX_BSS].wep_key_cmd = REPLY_WEPKEY; 4266 priv->contexts[IWL_RXON_CTX_BSS].wep_key_cmd = REPLY_WEPKEY;
4267 priv->contexts[IWL_RXON_CTX_BSS].ac_to_fifo = iwlagn_bss_ac_to_fifo;
4268 priv->contexts[IWL_RXON_CTX_BSS].ac_to_queue = iwlagn_bss_ac_to_queue;
4245 4269
4246 priv->contexts[IWL_RXON_CTX_PAN].rxon_cmd = REPLY_WIPAN_RXON; 4270 priv->contexts[IWL_RXON_CTX_PAN].rxon_cmd = REPLY_WIPAN_RXON;
4247 priv->contexts[IWL_RXON_CTX_PAN].rxon_timing_cmd = REPLY_WIPAN_RXON_TIMING; 4271 priv->contexts[IWL_RXON_CTX_PAN].rxon_timing_cmd = REPLY_WIPAN_RXON_TIMING;
@@ -4251,6 +4275,9 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
4251 priv->contexts[IWL_RXON_CTX_PAN].wep_key_cmd = REPLY_WIPAN_WEPKEY; 4275 priv->contexts[IWL_RXON_CTX_PAN].wep_key_cmd = REPLY_WIPAN_WEPKEY;
4252 priv->contexts[IWL_RXON_CTX_PAN].bcast_sta_id = IWLAGN_PAN_BCAST_ID; 4276 priv->contexts[IWL_RXON_CTX_PAN].bcast_sta_id = IWLAGN_PAN_BCAST_ID;
4253 priv->contexts[IWL_RXON_CTX_PAN].station_flags = STA_FLG_PAN_STATION; 4277 priv->contexts[IWL_RXON_CTX_PAN].station_flags = STA_FLG_PAN_STATION;
4278 priv->contexts[IWL_RXON_CTX_PAN].ac_to_fifo = iwlagn_pan_ac_to_fifo;
4279 priv->contexts[IWL_RXON_CTX_PAN].ac_to_queue = iwlagn_pan_ac_to_queue;
4280 priv->contexts[IWL_RXON_CTX_PAN].mcast_queue = IWL_IPAN_MCAST_QUEUE;
4254 4281
4255 BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2); 4282 BUILD_BUG_ON(NUM_IWL_RXON_CTX != 2);
4256 4283