Commit 4a6547c7 authored by Reinette Chatre's avatar Reinette Chatre Committed by John W. Linville

iwl3945: remove STATUS macros from header

iwl3945 includes iwl-core.h in which these STATUS flags are already
defined. This also removes a potential confusing definition with iwlcore
using STATUS_MODE_PENDING with value 18 and iwl3945 defining (but not
using) STATUS_CONF_PENDING for value 18.
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5c0ba62f
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
#include "iwl-sta.h" #include "iwl-sta.h"
#include "iwl-3945.h" #include "iwl-3945.h"
#include "iwl-eeprom.h" #include "iwl-eeprom.h"
#include "iwl-helpers.h"
#include "iwl-core.h" #include "iwl-core.h"
#include "iwl-helpers.h"
#include "iwl-led.h" #include "iwl-led.h"
#include "iwl-3945-led.h" #include "iwl-3945-led.h"
......
...@@ -171,24 +171,6 @@ struct iwl3945_frame { ...@@ -171,24 +171,6 @@ struct iwl3945_frame {
#define SCAN_INTERVAL 100 #define SCAN_INTERVAL 100
#define STATUS_HCMD_ACTIVE 0 /* host command in progress */
#define STATUS_HCMD_SYNC_ACTIVE 1 /* sync host command in progress */
#define STATUS_INT_ENABLED 2
#define STATUS_RF_KILL_HW 3
#define STATUS_INIT 5
#define STATUS_ALIVE 6
#define STATUS_READY 7
#define STATUS_TEMPERATURE 8
#define STATUS_GEO_CONFIGURED 9
#define STATUS_EXIT_PENDING 10
#define STATUS_STATISTICS 12
#define STATUS_SCANNING 13
#define STATUS_SCAN_ABORTING 14
#define STATUS_SCAN_HW 15
#define STATUS_POWER_PMI 16
#define STATUS_FW_ERROR 17
#define STATUS_CONF_PENDING 18
#define MAX_TID_COUNT 9 #define MAX_TID_COUNT 9
#define IWL_INVALID_RATE 0xFF #define IWL_INVALID_RATE 0xFF
......
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
#include "iwl-commands.h" #include "iwl-commands.h"
#include "iwl-sta.h" #include "iwl-sta.h"
#include "iwl-3945.h" #include "iwl-3945.h"
#include "iwl-helpers.h"
#include "iwl-core.h" #include "iwl-core.h"
#include "iwl-helpers.h"
#include "iwl-dev.h" #include "iwl-dev.h"
#include "iwl-spectrum.h" #include "iwl-spectrum.h"
......
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