diff options
| author | Johannes Berg | 2016-06-21 13:11:48 +0200 |
|---|---|---|
| committer | Luca Coelho | 2016-07-06 09:09:56 +0200 |
| commit | 21cb3222fe569bd09a42771ffc8da9fb4666bd8a (patch) | |
| tree | 6a59d2ca3f37396e81021f95ab30d1ef4cf6b503 /drivers/net/wireless/intel/iwlwifi/mvm/ops.c | |
| parent | iwlwifi: tracing: decouple from mac80211 (diff) | |
| download | kernel-qcow2-linux-21cb3222fe569bd09a42771ffc8da9fb4666bd8a.tar.gz kernel-qcow2-linux-21cb3222fe569bd09a42771ffc8da9fb4666bd8a.tar.xz kernel-qcow2-linux-21cb3222fe569bd09a42771ffc8da9fb4666bd8a.zip | |
iwlwifi: decouple PCIe transport from mac80211
The PCIe transport needs to store two pointers in each TX SKB, and
currently assumes mac80211's ieee80211_tx_info is present in the CB
to do that.
In order to remove that assumption, have the opmodes pass in the
offset to where the pointers can be stored in the CB and use the
offset in the PCIe code.
To make the disentanglement complete, remove mac80211.h includes
from everywhere in the generic iwlwifi code. This required adding
an include of cfg80211.h in one place.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/ops.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c index a08db009d32a..55d9096da68c 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c @@ -668,6 +668,9 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg, trans_cfg.cmd_fifo = IWL_MVM_TX_FIFO_CMD; trans_cfg.scd_set_active = true; + trans_cfg.cb_data_offs = offsetof(struct ieee80211_tx_info, + driver_data[2]); + trans_cfg.sdio_adma_addr = fw->sdio_adma_addr; trans_cfg.sw_csum_tx = IWL_MVM_SW_TX_CSUM_OFFLOAD; |