Commit a72b8b08 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville

iwlagn: add missing includes

a few h files weren't self contained. Fix that.
Move iwl_dma_ptr to transport layer since it is not used by the upper layer
any more.
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@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 9d6b2cb1
...@@ -65,6 +65,8 @@ ...@@ -65,6 +65,8 @@
/*This file includes the declaration that are exported from the bus layer */ /*This file includes the declaration that are exported from the bus layer */
#include <linux/types.h>
struct iwl_shared; struct iwl_shared;
struct iwl_bus; struct iwl_bus;
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#ifndef __iwl_debug_h__ #ifndef __iwl_debug_h__
#define __iwl_debug_h__ #define __iwl_debug_h__
#include "iwl-bus.h"
#include "iwl-shared.h" #include "iwl-shared.h"
struct iwl_priv; struct iwl_priv;
......
...@@ -641,13 +641,6 @@ static inline u8 get_cmd_index(struct iwl_queue *q, u32 index) ...@@ -641,13 +641,6 @@ static inline u8 get_cmd_index(struct iwl_queue *q, u32 index)
return index & (q->n_window - 1); return index & (q->n_window - 1);
} }
struct iwl_dma_ptr {
dma_addr_t dma;
void *addr;
size_t size;
};
#define IWL_OPERATION_MODE_AUTO 0 #define IWL_OPERATION_MODE_AUTO 0
#define IWL_OPERATION_MODE_HT_ONLY 1 #define IWL_OPERATION_MODE_HT_ONLY 1
#define IWL_OPERATION_MODE_MIXED 2 #define IWL_OPERATION_MODE_MIXED 2
......
...@@ -63,6 +63,8 @@ ...@@ -63,6 +63,8 @@
#ifndef __iwl_fh_h__ #ifndef __iwl_fh_h__
#define __iwl_fh_h__ #define __iwl_fh_h__
#include <linux/types.h>
/****************************/ /****************************/
/* Flow Handler Definitions */ /* Flow Handler Definitions */
/****************************/ /****************************/
......
...@@ -63,6 +63,11 @@ ...@@ -63,6 +63,11 @@
#ifndef __iwl_shared_h__ #ifndef __iwl_shared_h__
#define __iwl_shared_h__ #define __iwl_shared_h__
#include <linux/types.h>
#include <linux/spinlock.h>
#include <linux/mutex.h>
#include <linux/gfp.h>
/*This files includes all the types / functions that are exported by the /*This files includes all the types / functions that are exported by the
* upper layer to the bus and transport layer */ * upper layer to the bus and transport layer */
......
...@@ -29,7 +29,20 @@ ...@@ -29,7 +29,20 @@
#ifndef __iwl_trans_int_pcie_h__ #ifndef __iwl_trans_int_pcie_h__
#define __iwl_trans_int_pcie_h__ #define __iwl_trans_int_pcie_h__
#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/skbuff.h>
#include "iwl-fh.h" #include "iwl-fh.h"
#include "iwl-csr.h"
#include "iwl-shared.h"
#include "iwl-trans.h"
#include "iwl-debug.h"
#include "iwl-io.h"
struct iwl_tx_queue;
struct iwl_queue;
struct iwl_host_cmd;
/*This file includes the declaration that are internal to the /*This file includes the declaration that are internal to the
* trans_pcie layer */ * trans_pcie layer */
...@@ -88,6 +101,12 @@ struct iwl_rx_queue { ...@@ -88,6 +101,12 @@ struct iwl_rx_queue {
spinlock_t lock; spinlock_t lock;
}; };
struct iwl_dma_ptr {
dma_addr_t dma;
void *addr;
size_t size;
};
/** /**
* struct iwl_trans_pcie - PCIe transport specific data * struct iwl_trans_pcie - PCIe transport specific data
* @rxq: all the RX queue data * @rxq: all the RX queue data
......
...@@ -72,7 +72,6 @@ ...@@ -72,7 +72,6 @@
#include "iwl-trans-int-pcie.h" #include "iwl-trans-int-pcie.h"
/*TODO remove uneeded includes when the transport layer tx_free will be here */ /*TODO remove uneeded includes when the transport layer tx_free will be here */
#include "iwl-agn.h" #include "iwl-agn.h"
#include "iwl-core.h"
#include "iwl-shared.h" #include "iwl-shared.h"
static int iwl_trans_rx_alloc(struct iwl_trans *trans) static int iwl_trans_rx_alloc(struct iwl_trans *trans)
......
...@@ -64,6 +64,10 @@ ...@@ -64,6 +64,10 @@
#define __iwl_trans_h__ #define __iwl_trans_h__
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/skbuff.h>
#include "iwl-shared.h"
#include "iwl-commands.h"
/*This file includes the declaration that are exported from the transport /*This file includes the declaration that are exported from the transport
* layer */ * layer */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment