Commit e94a4099 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka
Browse files

iwlegacy: merge common header files 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
parent 98613be0

drivers/net/wireless/iwlegacy/3945-debug.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

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



#include "iwl-dev.h"

#include "common.h"

#include "3945.h"

drivers/net/wireless/iwlegacy/3945-mac.c

+2 −5
Original line number Diff line number Diff line
@@ -52,11 +52,8 @@ 
#define DRV_NAME	"iwl3945"



#include "commands.h"

#include "iwl-sta.h"

#include "3945.h"

#include "common.h"

#include "iwl-helpers.h"

#include "iwl-dev.h"

#include "3945.h"

#include "iwl-spectrum.h"



/*
@@ -1242,7 +1239,7 @@ static void il3945_rx_handle(struct il_priv *il) 
			       PCI_DMA_FROMDEVICE);

		pkt = rxb_addr(rxb);



		len = le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK;

		len = le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK;

		len += sizeof(u32); /* account for status word */



		/* Reclaim a command buffer only if this packet is a response

drivers/net/wireless/iwlegacy/3945-rs.c

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 


#include "commands.h"

#include "3945.h"

#include "iwl-sta.h"



#define RS_NAME "iwl-3945-rs"

drivers/net/wireless/iwlegacy/3945.c

+2 −4
Original line number Diff line number Diff line
@@ -39,11 +39,9 @@ 
#include <asm/unaligned.h>

#include <net/mac80211.h>



#include "common.h"

#include "commands.h"

#include "iwl-sta.h"

#include "iwl-eeprom.h"

#include "common.h"

#include "iwl-helpers.h"

#include "iwl-led.h"

#include "3945.h"
@@ -417,7 +415,7 @@ void il3945_hdl_stats(struct il_priv *il, 


	D_RX("Statistics notification received (%d vs %d).\n",

		     (int)sizeof(struct il3945_notif_stats),

		     le32_to_cpu(pkt->len_n_flags) & FH_RSCSR_FRAME_SIZE_MSK);

		     le32_to_cpu(pkt->len_n_flags) & IL_RX_FRAME_SIZE_MSK);

#ifdef CONFIG_IWLEGACY_DEBUGFS

	il3945_accumulative_stats(il, (__le32 *)&pkt->u.raw);

#endif

drivers/net/wireless/iwlegacy/3945.h

+1 −8
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ 
/* Hardware specific file defines the PCI IDs table for that hardware module */

extern const struct pci_device_id il3945_hw_card_ids[];



#include "common.h"

#include "iwl-prph.h"

#include "iwl-debug.h"

#include "iwl-power.h"

#include "iwl-dev.h"

#include "iwl-led.h"

#include "iwl-eeprom.h"
@@ -455,10 +455,6 @@ struct il3945_eeprom { 
#define RFD_SIZE                              4

#define NUM_TFD_CHUNKS                        4



#define RX_QUEUE_SIZE                         256

#define RX_QUEUE_MASK                         255

#define RX_QUEUE_SIZE_LOG                     8



#define TFD_CTL_COUNT_SET(n)       (n << 24)

#define TFD_CTL_COUNT_GET(ctl)     ((ctl >> 24) & 7)

#define TFD_CTL_PAD_SET(n)         (n << 28)
@@ -659,7 +655,4 @@ static ssize_t il3945_ucode_general_stats_read(struct file *file, 
}

#endif



/* Requires full declaration of il_priv before including */

#include "iwl-io.h"



#endif