diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-op-mode.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans.h | 6 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/tx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/tx.c | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/iwlwifi/iwl-op-mode.h index 98c7aa7346da..976448a57d02 100644 --- a/drivers/net/wireless/iwlwifi/iwl-op-mode.h +++ b/drivers/net/wireless/iwlwifi/iwl-op-mode.h | |||
@@ -93,7 +93,7 @@ struct iwl_cfg; | |||
93 | * 1) The driver layer (iwl-drv.c) chooses the op_mode based on the | 93 | * 1) The driver layer (iwl-drv.c) chooses the op_mode based on the |
94 | * capabilities advertized by the fw file (in TLV format). | 94 | * capabilities advertized by the fw file (in TLV format). |
95 | * 2) The driver layer starts the op_mode (ops->start) | 95 | * 2) The driver layer starts the op_mode (ops->start) |
96 | * 3) The op_mode registers registers mac80211 | 96 | * 3) The op_mode registers mac80211 |
97 | * 4) The op_mode is governed by mac80211 | 97 | * 4) The op_mode is governed by mac80211 |
98 | * 5) The driver layer stops the op_mode | 98 | * 5) The driver layer stops the op_mode |
99 | */ | 99 | */ |
@@ -112,7 +112,7 @@ struct iwl_cfg; | |||
112 | * @stop: stop the op_mode. Must free all the memory allocated. | 112 | * @stop: stop the op_mode. Must free all the memory allocated. |
113 | * May sleep | 113 | * May sleep |
114 | * @rx: Rx notification to the op_mode. rxb is the Rx buffer itself. Cmd is the | 114 | * @rx: Rx notification to the op_mode. rxb is the Rx buffer itself. Cmd is the |
115 | * HCMD the this Rx responds to. | 115 | * HCMD this Rx responds to. |
116 | * This callback may sleep, it is called from a threaded IRQ handler. | 116 | * This callback may sleep, it is called from a threaded IRQ handler. |
117 | * @queue_full: notifies that a HW queue is full. | 117 | * @queue_full: notifies that a HW queue is full. |
118 | * Must be atomic and called with BH disabled. | 118 | * Must be atomic and called with BH disabled. |
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans.h b/drivers/net/wireless/iwlwifi/iwl-trans.h index 8d91422c5982..523dc7ce294b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans.h +++ b/drivers/net/wireless/iwlwifi/iwl-trans.h | |||
@@ -180,7 +180,7 @@ struct iwl_rx_packet { | |||
180 | * enum CMD_MODE - how to send the host commands ? | 180 | * enum CMD_MODE - how to send the host commands ? |
181 | * | 181 | * |
182 | * @CMD_SYNC: The caller will be stalled until the fw responds to the command | 182 | * @CMD_SYNC: The caller will be stalled until the fw responds to the command |
183 | * @CMD_ASYNC: Return right away and don't want for the response | 183 | * @CMD_ASYNC: Return right away and don't wait for the response |
184 | * @CMD_WANT_SKB: valid only with CMD_SYNC. The caller needs the buffer of the | 184 | * @CMD_WANT_SKB: valid only with CMD_SYNC. The caller needs the buffer of the |
185 | * response. The caller needs to call iwl_free_resp when done. | 185 | * response. The caller needs to call iwl_free_resp when done. |
186 | */ | 186 | */ |
@@ -218,7 +218,7 @@ struct iwl_device_cmd { | |||
218 | * | 218 | * |
219 | * @IWL_HCMD_DFL_NOCOPY: By default, the command is copied to the host command's | 219 | * @IWL_HCMD_DFL_NOCOPY: By default, the command is copied to the host command's |
220 | * ring. The transport layer doesn't map the command's buffer to DMA, but | 220 | * ring. The transport layer doesn't map the command's buffer to DMA, but |
221 | * rather copies it to an previously allocated DMA buffer. This flag tells | 221 | * rather copies it to a previously allocated DMA buffer. This flag tells |
222 | * the transport layer not to copy the command, but to map the existing | 222 | * the transport layer not to copy the command, but to map the existing |
223 | * buffer (that is passed in) instead. This saves the memcpy and allows | 223 | * buffer (that is passed in) instead. This saves the memcpy and allows |
224 | * commands that are bigger than the fixed buffer to be submitted. | 224 | * commands that are bigger than the fixed buffer to be submitted. |
@@ -243,7 +243,7 @@ enum iwl_hcmd_dataflag { | |||
243 | * @handler_status: return value of the handler of the command | 243 | * @handler_status: return value of the handler of the command |
244 | * (put in setup_rx_handlers) - valid for SYNC mode only | 244 | * (put in setup_rx_handlers) - valid for SYNC mode only |
245 | * @flags: can be CMD_* | 245 | * @flags: can be CMD_* |
246 | * @len: array of the lenths of the chunks in data | 246 | * @len: array of the lengths of the chunks in data |
247 | * @dataflags: IWL_HCMD_DFL_* | 247 | * @dataflags: IWL_HCMD_DFL_* |
248 | * @id: id of the host command | 248 | * @id: id of the host command |
249 | */ | 249 | */ |
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index 76cdba65b321..deebe8f9c00d 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c | |||
@@ -503,7 +503,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, | |||
503 | 503 | ||
504 | mutex_lock(&mvm->mutex); | 504 | mutex_lock(&mvm->mutex); |
505 | 505 | ||
506 | /* Allocate resources for the MAC context, and add it the the fw */ | 506 | /* Allocate resources for the MAC context, and add it to the fw */ |
507 | ret = iwl_mvm_mac_ctxt_init(mvm, vif); | 507 | ret = iwl_mvm_mac_ctxt_init(mvm, vif); |
508 | if (ret) | 508 | if (ret) |
509 | goto out_unlock; | 509 | goto out_unlock; |
diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c index 7694b8fa4c37..f68ef9dd6a70 100644 --- a/drivers/net/wireless/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/iwlwifi/mvm/tx.c | |||
@@ -173,7 +173,7 @@ static void iwl_mvm_set_tx_cmd_rate(struct iwl_mvm *mvm, | |||
173 | } | 173 | } |
174 | 174 | ||
175 | /* | 175 | /* |
176 | * for data packets, rate info comes from the table inside he fw. This | 176 | * for data packets, rate info comes from the table inside the fw. This |
177 | * table is controlled by LINK_QUALITY commands | 177 | * table is controlled by LINK_QUALITY commands |
178 | */ | 178 | */ |
179 | 179 | ||
diff --git a/drivers/net/wireless/iwlwifi/pcie/tx.c b/drivers/net/wireless/iwlwifi/pcie/tx.c index 134f7a109f47..f29cd5c0aeed 100644 --- a/drivers/net/wireless/iwlwifi/pcie/tx.c +++ b/drivers/net/wireless/iwlwifi/pcie/tx.c | |||
@@ -1153,10 +1153,10 @@ void iwl_trans_pcie_txq_disable(struct iwl_trans *trans, int txq_id) | |||
1153 | /* | 1153 | /* |
1154 | * iwl_pcie_enqueue_hcmd - enqueue a uCode command | 1154 | * iwl_pcie_enqueue_hcmd - enqueue a uCode command |
1155 | * @priv: device private data point | 1155 | * @priv: device private data point |
1156 | * @cmd: a point to the ucode command structure | 1156 | * @cmd: a pointer to the ucode command structure |
1157 | * | 1157 | * |
1158 | * The function returns < 0 values to indicate the operation is | 1158 | * The function returns < 0 values to indicate the operation |
1159 | * failed. On success, it turns the index (> 0) of command in the | 1159 | * failed. On success, it returns the index (>= 0) of command in the |
1160 | * command queue. | 1160 | * command queue. |
1161 | */ | 1161 | */ |
1162 | static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, | 1162 | static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans, |