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

iwlwifi: move queue functions to PCI-E 



iwl_queue_inc_wrap/iwl_queue_dec_wrap aren't
shared functions, they are PCI-E specific,
so move them into the appropriate header.

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 c977a33d

drivers/net/wireless/iwlwifi/iwl-shared.h

+0 −20
Original line number Diff line number Diff line
@@ -413,26 +413,6 @@ static inline bool iwl_have_debug_level(u32 level) 
	return iwlagn_mod_params.debug_level & level;

}



/**

 * iwl_queue_inc_wrap - increment queue index, wrap back to beginning

 * @index -- current index

 * @n_bd -- total number of entries in queue (must be power of 2)

 */

static inline int iwl_queue_inc_wrap(int index, int n_bd)

{

	return ++index & (n_bd - 1);

}



/**

 * iwl_queue_dec_wrap - decrement queue index, wrap back to end

 * @index -- current index

 * @n_bd -- total number of entries in queue (must be power of 2)

 */

static inline int iwl_queue_dec_wrap(int index, int n_bd)

{

	return --index & (n_bd - 1);

}



struct iwl_rx_cmd_buffer {

	struct page *_page;

};

drivers/net/wireless/iwlwifi/iwl-trans-pcie-int.h

+20 −0
Original line number Diff line number Diff line
@@ -115,6 +115,26 @@ struct iwl_dma_ptr { 
	size_t size;

};



/**

 * iwl_queue_inc_wrap - increment queue index, wrap back to beginning

 * @index -- current index

 * @n_bd -- total number of entries in queue (must be power of 2)

 */

static inline int iwl_queue_inc_wrap(int index, int n_bd)

{

	return ++index & (n_bd - 1);

}



/**

 * iwl_queue_dec_wrap - decrement queue index, wrap back to end

 * @index -- current index

 * @n_bd -- total number of entries in queue (must be power of 2)

 */

static inline int iwl_queue_dec_wrap(int index, int n_bd)

{

	return --index & (n_bd - 1);

}



/*

 * This queue number is required for proper operation

 * because the ucode will stop/start the scheduler as