diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-11 08:37:22 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-11 08:37:22 -0500 |
| commit | 7c5556decd0a629e9ee02e93653f75ba7b7da03c (patch) | |
| tree | bc56819788e9226efc04a1d1710b99fa6d4512e4 /drivers/net/wireless/intel/iwlwifi/mvm/ops.c | |
| parent | 39b175211053c7a6a4d794c42e225994f1c069c2 (diff) | |
| parent | fdd0bd88ceaecf729db103ac8836af5805dd2dc1 (diff) | |
Merge tag 'wireless-drivers-next-for-davem-2017-11-11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 4.15
Last minute patches before the merge window. Not really anything
special standing out, mostly fixes or cleanup and some minor new
features.
Major changes:
iwlwifi
* some new PCI IDs
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/ops.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index e82b4462722b..ce718e9c63ec 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c | |||
| @@ -703,7 +703,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, | |||
| 703 | trans_cfg.cb_data_offs = offsetof(struct ieee80211_tx_info, | 703 | trans_cfg.cb_data_offs = offsetof(struct ieee80211_tx_info, |
| 704 | driver_data[2]); | 704 | driver_data[2]); |
| 705 | 705 | ||
| 706 | trans_cfg.sdio_adma_addr = fw->sdio_adma_addr; | ||
| 707 | trans_cfg.sw_csum_tx = IWL_MVM_SW_TX_CSUM_OFFLOAD; | 706 | trans_cfg.sw_csum_tx = IWL_MVM_SW_TX_CSUM_OFFLOAD; |
| 708 | 707 | ||
| 709 | /* Set a short watchdog for the command queue */ | 708 | /* Set a short watchdog for the command queue */ |