diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2008-05-04 22:22:43 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-05-14 16:29:46 -0400 |
commit | 1053d35f4ed6876ad9d3a14cdae363db0a7e9b0a (patch) | |
tree | 64c30d5add3bd5be8857803c06c2aedf71182c72 /drivers/net/wireless/iwlwifi/iwl-4965-hw.h | |
parent | 5a676bbeaf9e534b75286f2294ec57a4c544f1d2 (diff) |
iwlwifi: move NIC init and Tx queues init to iwlcore
This patch does the following:
1 - change hw_nic_init from a handler to a function
2 - move hw_nic_init function to iwlcore
3 - open a new file - iwl-tx.c
4 - move all Tx queues initialization (part of NIC init) to iwl-tx.c
5 - move iwl_rx_init, previously as part of the NIC init, to iwl-rx.c
6 - iwl4965_tfd_frame rename to iwl_tfd_frame
Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965-hw.h')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h index 29749e2a8ff0..ee55b283226b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965-hw.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965-hw.h | |||
@@ -829,7 +829,7 @@ static inline __le32 iwl4965_hw_set_rate_n_flags(u8 rate, u16 flags) | |||
829 | #define IWL49_NUM_QUEUES 16 | 829 | #define IWL49_NUM_QUEUES 16 |
830 | 830 | ||
831 | /** | 831 | /** |
832 | * struct iwl4965_tfd_frame_data | 832 | * struct iwl_tfd_frame_data |
833 | * | 833 | * |
834 | * Describes up to 2 buffers containing (contiguous) portions of a Tx frame. | 834 | * Describes up to 2 buffers containing (contiguous) portions of a Tx frame. |
835 | * Each buffer must be on dword boundary. | 835 | * Each buffer must be on dword boundary. |
@@ -848,7 +848,7 @@ static inline __le32 iwl4965_hw_set_rate_n_flags(u8 rate, u16 flags) | |||
848 | * 31-20: Tx buffer 2 length (bytes) | 848 | * 31-20: Tx buffer 2 length (bytes) |
849 | * 19- 0: Tx buffer 2 address bits [35:16] | 849 | * 19- 0: Tx buffer 2 address bits [35:16] |
850 | */ | 850 | */ |
851 | struct iwl4965_tfd_frame_data { | 851 | struct iwl_tfd_frame_data { |
852 | __le32 tb1_addr; | 852 | __le32 tb1_addr; |
853 | 853 | ||
854 | __le32 val1; | 854 | __le32 val1; |
@@ -878,7 +878,7 @@ struct iwl4965_tfd_frame_data { | |||
878 | 878 | ||
879 | 879 | ||
880 | /** | 880 | /** |
881 | * struct iwl4965_tfd_frame | 881 | * struct iwl_tfd_frame |
882 | * | 882 | * |
883 | * Transmit Frame Descriptor (TFD) | 883 | * Transmit Frame Descriptor (TFD) |
884 | * | 884 | * |
@@ -905,7 +905,7 @@ struct iwl4965_tfd_frame_data { | |||
905 | * | 905 | * |
906 | * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx. | 906 | * A maximum of 255 (not 256!) TFDs may be on a queue waiting for Tx. |
907 | */ | 907 | */ |
908 | struct iwl4965_tfd_frame { | 908 | struct iwl_tfd_frame { |
909 | __le32 val0; | 909 | __le32 val0; |
910 | /* __le32 rsvd1:24; */ | 910 | /* __le32 rsvd1:24; */ |
911 | /* __le32 num_tbs:5; */ | 911 | /* __le32 num_tbs:5; */ |
@@ -914,7 +914,7 @@ struct iwl4965_tfd_frame { | |||
914 | #define IWL_num_tbs_SYM val0 | 914 | #define IWL_num_tbs_SYM val0 |
915 | /* __le32 rsvd2:1; */ | 915 | /* __le32 rsvd2:1; */ |
916 | /* __le32 padding:2; */ | 916 | /* __le32 padding:2; */ |
917 | struct iwl4965_tfd_frame_data pa[10]; | 917 | struct iwl_tfd_frame_data pa[10]; |
918 | __le32 reserved; | 918 | __le32 reserved; |
919 | } __attribute__ ((packed)); | 919 | } __attribute__ ((packed)); |
920 | 920 | ||