Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c17d0681 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: move PCI-E transport files 



Move all the PCI-E specific transport files to
be iwl-trans-pcie*; specifically iwl-trans.c
which is really iwl-trans-pcie.c.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 701cb099

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ iwlagn-objs += iwl-6000.o 
iwlagn-objs             += iwl-1000.o

iwlagn-objs             += iwl-2000.o

iwlagn-objs             += iwl-pci.o

iwlagn-objs             += iwl-trans.o iwl-trans-rx-pcie.o iwl-trans-tx-pcie.o

iwlagn-objs             += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o



iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

drivers/net/wireless/iwlwifi/iwl-trans-rx-pcie.c→drivers/net/wireless/iwlwifi/iwl-trans-pcie-rx.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-helpers.h"

#include "iwl-trans-int-pcie.h"

#include "iwl-trans-pcie-int.h"



/******************************************************************************

 *

drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c→drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include "iwl-io.h"

#include "iwl-agn-hw.h"

#include "iwl-helpers.h"

#include "iwl-trans-int-pcie.h"

#include "iwl-trans-pcie-int.h"



#define IWL_TX_CRC_SIZE 4

#define IWL_TX_DELIMITER_SIZE 4
@@ -544,7 +544,7 @@ int iwl_trans_pcie_tx_agg_alloc(struct iwl_trans *trans, 
	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	struct iwl_tid_data *tid_data;

	unsigned long flags;

	int txq_id;

	u16 txq_id;



	txq_id = iwlagn_txq_ctx_activate_free(trans);

	if (txq_id == -1) {

drivers/net/wireless/iwlwifi/iwl-trans.c→drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+4 −7
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
#include <linux/gfp.h>



#include "iwl-trans.h"

#include "iwl-trans-int-pcie.h"

#include "iwl-trans-pcie-int.h"

#include "iwl-csr.h"

#include "iwl-prph.h"

#include "iwl-shared.h"
@@ -142,9 +142,7 @@ static void iwl_trans_rx_hw_init(struct iwl_trans *trans, 
{

	u32 rb_size;

	const u32 rfdnlog = RX_QUEUE_SIZE_LOG; /* 256 RBDs */

	u32 rb_timeout = 0; /* FIXME: RX_RB_TIMEOUT for all devices? */



	rb_timeout = RX_RB_TIMEOUT;

	u32 rb_timeout = RX_RB_TIMEOUT; /* FIXME: RX_RB_TIMEOUT for all devices? */



	if (iwlagn_mod_params.amsdu_size_8K)

		rb_size = FH_RCSR_RX_CONFIG_REG_VAL_RB_SIZE_8K;
@@ -308,8 +306,8 @@ static int iwl_trans_txq_alloc(struct iwl_trans *trans, 


	txq->q.n_window = slots_num;



	txq->meta = kcalloc(slots_num, sizeof(txq->meta[0]), GFP_KERNEL);

	txq->cmd = kcalloc(slots_num, sizeof(txq->cmd[0]), GFP_KERNEL);

	txq->meta = kzalloc(sizeof(txq->meta[0]) * slots_num, GFP_KERNEL);

	txq->cmd = kzalloc(sizeof(txq->cmd[0]) * slots_num, GFP_KERNEL);



	if (!txq->meta || !txq->cmd)

		goto error;
@@ -1995,4 +1993,3 @@ const struct iwl_trans_ops trans_ops_pcie = { 
	.suspend = iwl_trans_pcie_suspend,

	.resume = iwl_trans_pcie_resume,

};