Skip to content

L
linux
Commit ee8e365a authored by James Ketrenos's avatar James Ketrenos
Browse files
Options

Ran scripts/Lindent on drivers/net/wireless/ipw2{1,2}00.{c,h} 

No other changes.
Signed-off-by: default avatarJames Ketrenos <jketreno@linux.intel.com>
parent d7e02edb
Show whitespace changes
Inline Side-by-side
Showing with 1155 additions and 1218 deletions
drivers/net/wireless/ipw2100.c
View file @ ee8e365a
This source diff could not be displayed because it is too large. You can view the blob instead.
drivers/net/wireless/ipw2100.h
View file @ ee8e365a
...@@ -93,7 +93,6 @@ struct ipw2100_rx_packet; ...@@ -93,7 +93,6 @@ struct ipw2100_rx_packet;
#define IPW_DL_IOCTL (1<<14) #define IPW_DL_IOCTL (1<<14)
#define IPW_DL_RF_KILL (1<<17) #define IPW_DL_RF_KILL (1<<17)
#define IPW_DL_MANAGE (1<<15) #define IPW_DL_MANAGE (1<<15)
#define IPW_DL_FW (1<<16) #define IPW_DL_FW (1<<16)
...@@ -156,7 +155,9 @@ extern const char *band_str[]; ...@@ -156,7 +155,9 @@ extern const char *band_str[];
struct bd_status { struct bd_status {
union { union {
struct { u8 nlf:1, txType:2, intEnabled:1, reserved:4;} fields; struct {
u8 nlf:1, txType:2, intEnabled:1, reserved:4;
} fields;
u8 field; u8 field;
} info; } info;
} __attribute__ ((packed)); } __attribute__ ((packed));
...@@ -313,7 +314,6 @@ struct host_command { ...@@ -313,7 +314,6 @@ struct host_command {
u32 host_command_parameters[HOST_COMMAND_PARAMS_REG_LEN]; // COMMAND PARAMETERS u32 host_command_parameters[HOST_COMMAND_PARAMS_REG_LEN]; // COMMAND PARAMETERS
} __attribute__ ((packed)); } __attribute__ ((packed));
typedef enum { typedef enum {
POWER_ON_RESET, POWER_ON_RESET,
EXIT_POWER_DOWN_RESET, EXIT_POWER_DOWN_RESET,
...@@ -328,17 +328,16 @@ enum { ...@@ -328,17 +328,16 @@ enum {
RX RX
}; };
struct ipw2100_tx_packet { struct ipw2100_tx_packet {
int type; int type;
int index; int index;
union { union {
struct { /* COMMAND */ struct { /* COMMAND */
struct ipw2100_cmd_header* cmd; struct ipw2100_cmd_header *cmd;
dma_addr_t cmd_phys; dma_addr_t cmd_phys;
} c_struct; } c_struct;
struct { /* DATA */ struct { /* DATA */
struct ipw2100_data_header* data; struct ipw2100_data_header *data;
dma_addr_t data_phys; dma_addr_t data_phys;
struct ieee80211_txb *txb; struct ieee80211_txb *txb;
} d_struct; } d_struct;
...@@ -348,7 +347,6 @@ struct ipw2100_tx_packet { ...@@ -348,7 +347,6 @@ struct ipw2100_tx_packet {
struct list_head list; struct list_head list;
}; };
struct ipw2100_rx_packet { struct ipw2100_rx_packet {
struct ipw2100_rx *rxp; struct ipw2100_rx *rxp;
dma_addr_t dma_addr; dma_addr_t dma_addr;
...@@ -453,8 +451,6 @@ enum { ...@@ -453,8 +451,6 @@ enum {
#define STATUS_RESET_PENDING (1<<29) #define STATUS_RESET_PENDING (1<<29)
#define STATUS_SECURITY_UPDATED (1<<30) /* Security sync needed */ #define STATUS_SECURITY_UPDATED (1<<30) /* Security sync needed */
/* Internal NIC states */ /* Internal NIC states */
#define IPW_STATE_INITIALIZED (1<<0) #define IPW_STATE_INITIALIZED (1<<0)
#define IPW_STATE_COUNTRY_FOUND (1<<1) #define IPW_STATE_COUNTRY_FOUND (1<<1)
...@@ -469,8 +465,6 @@ enum { ...@@ -469,8 +465,6 @@ enum {
#define IPW_STATE_POWER_DOWN (1<<10) #define IPW_STATE_POWER_DOWN (1<<10)
#define IPW_STATE_SCANNING (1<<11) #define IPW_STATE_SCANNING (1<<11)
#define CFG_STATIC_CHANNEL (1<<0) /* Restrict assoc. to single channel */ #define CFG_STATIC_CHANNEL (1<<0) /* Restrict assoc. to single channel */
#define CFG_STATIC_ESSID (1<<1) /* Restrict assoc. to single SSID */ #define CFG_STATIC_ESSID (1<<1) /* Restrict assoc. to single SSID */
#define CFG_STATIC_BSSID (1<<2) /* Restrict assoc. to single BSSID */ #define CFG_STATIC_BSSID (1<<2) /* Restrict assoc. to single BSSID */
...@@ -520,7 +514,7 @@ struct ipw2100_priv { ...@@ -520,7 +514,7 @@ struct ipw2100_priv {
int hangs; int hangs;
u32 last_rtc; u32 last_rtc;
int dump_raw; /* 1 to dump raw bytes in /sys/.../memory */ int dump_raw; /* 1 to dump raw bytes in /sys/.../memory */
u8* snapshot[0x30]; u8 *snapshot[0x30];
u8 mandatory_bssid_mac[ETH_ALEN]; u8 mandatory_bssid_mac[ETH_ALEN];
u8 mac_addr[ETH_ALEN]; u8 mac_addr[ETH_ALEN];
...@@ -531,7 +525,6 @@ struct ipw2100_priv { ...@@ -531,7 +525,6 @@ struct ipw2100_priv {
struct ieee80211_security sec; struct ieee80211_security sec;
int messages_sent; int messages_sent;
int short_retry_limit; int short_retry_limit;
int long_retry_limit; int long_retry_limit;
...@@ -599,7 +592,6 @@ struct ipw2100_priv { ...@@ -599,7 +592,6 @@ struct ipw2100_priv {
wait_queue_head_t wait_command_queue; wait_queue_head_t wait_command_queue;
}; };
/********************************************************* /*********************************************************
* Host Command -> From Driver to FW * Host Command -> From Driver to FW
*********************************************************/ *********************************************************/
...@@ -646,7 +638,6 @@ struct ipw2100_priv { ...@@ -646,7 +638,6 @@ struct ipw2100_priv {
#define CARD_DISABLE_PHY_OFF 61 #define CARD_DISABLE_PHY_OFF 61
#define MSDU_TX_RATES 62 #define MSDU_TX_RATES 62
/* Rogue AP Detection */ /* Rogue AP Detection */
#define SET_STATION_STAT_BITS 64 #define SET_STATION_STAT_BITS 64
#define CLEAR_STATIONS_STAT_BITS 65 #define CLEAR_STATIONS_STAT_BITS 65
...@@ -655,8 +646,6 @@ struct ipw2100_priv { ...@@ -655,8 +646,6 @@ struct ipw2100_priv {
#define DISASSOCIATION_BSSID 68 #define DISASSOCIATION_BSSID 68
#define SET_WPA_IE 69 #define SET_WPA_IE 69
/* system configuration bit mask: */ /* system configuration bit mask: */
#define IPW_CFG_MONITOR 0x00004 #define IPW_CFG_MONITOR 0x00004
#define IPW_CFG_PREAMBLE_AUTO 0x00010 #define IPW_CFG_PREAMBLE_AUTO 0x00010
...@@ -784,9 +773,6 @@ struct ipw2100_priv { ...@@ -784,9 +773,6 @@ struct ipw2100_priv {
#define IPW_CARD_DISABLE_PHY_OFF_COMPLETE_WAIT 100 // 100 milli #define IPW_CARD_DISABLE_PHY_OFF_COMPLETE_WAIT 100 // 100 milli
#define IPW_PREPARE_POWER_DOWN_COMPLETE_WAIT 100 // 100 milli #define IPW_PREPARE_POWER_DOWN_COMPLETE_WAIT 100 // 100 milli
#define IPW_HEADER_802_11_SIZE sizeof(struct ieee80211_hdr_3addr) #define IPW_HEADER_802_11_SIZE sizeof(struct ieee80211_hdr_3addr)
#define IPW_MAX_80211_PAYLOAD_SIZE 2304U #define IPW_MAX_80211_PAYLOAD_SIZE 2304U
#define IPW_MAX_802_11_PAYLOAD_LENGTH 2312 #define IPW_MAX_802_11_PAYLOAD_LENGTH 2312
...@@ -856,7 +842,6 @@ struct ipw2100_rx { ...@@ -856,7 +842,6 @@ struct ipw2100_rx {
#define DIVERSITY_ANTENNA_A 1 // Use antenna A #define DIVERSITY_ANTENNA_A 1 // Use antenna A
#define DIVERSITY_ANTENNA_B 2 // Use antenna B #define DIVERSITY_ANTENNA_B 2 // Use antenna B
#define HOST_COMMAND_WAIT 0 #define HOST_COMMAND_WAIT 0
#define HOST_COMMAND_NO_WAIT 1 #define HOST_COMMAND_NO_WAIT 1
...@@ -873,7 +858,6 @@ struct ipw2100_rx { ...@@ -873,7 +858,6 @@ struct ipw2100_rx {
#define TYPE_ASSOCIATION_REQUEST 0x0013 #define TYPE_ASSOCIATION_REQUEST 0x0013
#define TYPE_REASSOCIATION_REQUEST 0x0014 #define TYPE_REASSOCIATION_REQUEST 0x0014
#define HW_FEATURE_RFKILL (0x0001) #define HW_FEATURE_RFKILL (0x0001)
#define RF_KILLSWITCH_OFF (1) #define RF_KILLSWITCH_OFF (1)
#define RF_KILLSWITCH_ON (0) #define RF_KILLSWITCH_ON (0)
...@@ -895,7 +879,7 @@ struct ipw2100_rx { ...@@ -895,7 +879,7 @@ struct ipw2100_rx {
// Fixed size data: Ordinal Table 1 // Fixed size data: Ordinal Table 1
typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
// Transmit statistics // Transmit statistics
IPW_ORD_STAT_TX_HOST_REQUESTS = 1,// # of requested Host Tx's (MSDU) IPW_ORD_STAT_TX_HOST_REQUESTS = 1, // # of requested Host Tx's (MSDU)
IPW_ORD_STAT_TX_HOST_COMPLETE, // # of successful Host Tx's (MSDU) IPW_ORD_STAT_TX_HOST_COMPLETE, // # of successful Host Tx's (MSDU)
IPW_ORD_STAT_TX_DIR_DATA, // # of successful Directed Tx's (MSDU) IPW_ORD_STAT_TX_DIR_DATA, // # of successful Directed Tx's (MSDU)
...@@ -905,7 +889,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW ...@@ -905,7 +889,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
IPW_ORD_STAT_TX_DIR_DATA11, // # of successful Directed Tx's (MSDU) @ 11MB IPW_ORD_STAT_TX_DIR_DATA11, // # of successful Directed Tx's (MSDU) @ 11MB
IPW_ORD_STAT_TX_DIR_DATA22, // # of successful Directed Tx's (MSDU) @ 22MB IPW_ORD_STAT_TX_DIR_DATA22, // # of successful Directed Tx's (MSDU) @ 22MB
IPW_ORD_STAT_TX_NODIR_DATA1 = 13,// # of successful Non_Directed Tx's (MSDU) @ 1MB IPW_ORD_STAT_TX_NODIR_DATA1 = 13, // # of successful Non_Directed Tx's (MSDU) @ 1MB
IPW_ORD_STAT_TX_NODIR_DATA2, // # of successful Non_Directed Tx's (MSDU) @ 2MB IPW_ORD_STAT_TX_NODIR_DATA2, // # of successful Non_Directed Tx's (MSDU) @ 2MB
IPW_ORD_STAT_TX_NODIR_DATA5_5, // # of successful Non_Directed Tx's (MSDU) @ 5.5MB IPW_ORD_STAT_TX_NODIR_DATA5_5, // # of successful Non_Directed Tx's (MSDU) @ 5.5MB
IPW_ORD_STAT_TX_NODIR_DATA11, // # of successful Non_Directed Tx's (MSDU) @ 11MB IPW_ORD_STAT_TX_NODIR_DATA11, // # of successful Non_Directed Tx's (MSDU) @ 11MB
...@@ -926,7 +910,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW ...@@ -926,7 +910,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
IPW_ORD_STAT_TX_AUTH, // # of successful Authentication Tx IPW_ORD_STAT_TX_AUTH, // # of successful Authentication Tx
IPW_ORD_STAT_TX_DEAUTH, // # of successful Deauthentication TX IPW_ORD_STAT_TX_DEAUTH, // # of successful Deauthentication TX
IPW_ORD_STAT_TX_TOTAL_BYTES = 41,// Total successful Tx data bytes IPW_ORD_STAT_TX_TOTAL_BYTES = 41, // Total successful Tx data bytes
IPW_ORD_STAT_TX_RETRIES, // # of Tx retries IPW_ORD_STAT_TX_RETRIES, // # of Tx retries
IPW_ORD_STAT_TX_RETRY1, // # of Tx retries at 1MBPS IPW_ORD_STAT_TX_RETRY1, // # of Tx retries at 1MBPS
IPW_ORD_STAT_TX_RETRY2, // # of Tx retries at 2MBPS IPW_ORD_STAT_TX_RETRY2, // # of Tx retries at 2MBPS
...@@ -935,7 +919,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW ...@@ -935,7 +919,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
IPW_ORD_STAT_TX_FAILURES = 51, // # of Tx Failures IPW_ORD_STAT_TX_FAILURES = 51, // # of Tx Failures
IPW_ORD_STAT_TX_ABORT_AT_HOP, //NS // # of Tx's aborted at hop time IPW_ORD_STAT_TX_ABORT_AT_HOP, //NS // # of Tx's aborted at hop time
IPW_ORD_STAT_TX_MAX_TRIES_IN_HOP,// # of times max tries in a hop failed IPW_ORD_STAT_TX_MAX_TRIES_IN_HOP, // # of times max tries in a hop failed
IPW_ORD_STAT_TX_ABORT_LATE_DMA, //NS // # of times tx aborted due to late dma setup IPW_ORD_STAT_TX_ABORT_LATE_DMA, //NS // # of times tx aborted due to late dma setup
IPW_ORD_STAT_TX_ABORT_STX, //NS // # of times backoff aborted IPW_ORD_STAT_TX_ABORT_STX, //NS // # of times backoff aborted
IPW_ORD_STAT_TX_DISASSN_FAIL, // # of times disassociation failed IPW_ORD_STAT_TX_DISASSN_FAIL, // # of times disassociation failed
...@@ -952,7 +936,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW ...@@ -952,7 +936,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
IPW_ORD_STAT_RX_DIR_DATA11, // # of directed packets at 11MB IPW_ORD_STAT_RX_DIR_DATA11, // # of directed packets at 11MB
IPW_ORD_STAT_RX_DIR_DATA22, // # of directed packets at 22MB IPW_ORD_STAT_RX_DIR_DATA22, // # of directed packets at 22MB
IPW_ORD_STAT_RX_NODIR_DATA = 71,// # of nondirected packets IPW_ORD_STAT_RX_NODIR_DATA = 71, // # of nondirected packets
IPW_ORD_STAT_RX_NODIR_DATA1, // # of nondirected packets at 1MB IPW_ORD_STAT_RX_NODIR_DATA1, // # of nondirected packets at 1MB
IPW_ORD_STAT_RX_NODIR_DATA2, // # of nondirected packets at 2MB IPW_ORD_STAT_RX_NODIR_DATA2, // # of nondirected packets at 2MB
IPW_ORD_STAT_RX_NODIR_DATA5_5, // # of nondirected packets at 5.5MB IPW_ORD_STAT_RX_NODIR_DATA5_5, // # of nondirected packets at 5.5MB
...@@ -977,7 +961,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW ...@@ -977,7 +961,7 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
IPW_ORD_STAT_RX_AUTH, // # of authentication Rx IPW_ORD_STAT_RX_AUTH, // # of authentication Rx
IPW_ORD_STAT_RX_DEAUTH, // # of deauthentication Rx IPW_ORD_STAT_RX_DEAUTH, // # of deauthentication Rx
IPW_ORD_STAT_RX_TOTAL_BYTES = 101,// Total rx data bytes received IPW_ORD_STAT_RX_TOTAL_BYTES = 101, // Total rx data bytes received
IPW_ORD_STAT_RX_ERR_CRC, // # of packets with Rx CRC error IPW_ORD_STAT_RX_ERR_CRC, // # of packets with Rx CRC error
IPW_ORD_STAT_RX_ERR_CRC1, // # of Rx CRC errors at 1MB IPW_ORD_STAT_RX_ERR_CRC1, // # of Rx CRC errors at 1MB
IPW_ORD_STAT_RX_ERR_CRC2, // # of Rx CRC errors at 2MB IPW_ORD_STAT_RX_ERR_CRC2, // # of Rx CRC errors at 2MB
...@@ -1006,17 +990,17 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW ...@@ -1006,17 +990,17 @@ typedef enum _ORDINAL_TABLE_1 { // NS - means Not Supported by FW
IPW_ORD_STAT_RX_ICV_ERRORS, // # of ICV errors during decryption IPW_ORD_STAT_RX_ICV_ERRORS, // # of ICV errors during decryption
// PSP Statistics // PSP Statistics
IPW_ORD_STAT_PSP_SUSPENSION = 137,// # of times adapter suspended IPW_ORD_STAT_PSP_SUSPENSION = 137, // # of times adapter suspended
IPW_ORD_STAT_PSP_BCN_TIMEOUT, // # of beacon timeout IPW_ORD_STAT_PSP_BCN_TIMEOUT, // # of beacon timeout
IPW_ORD_STAT_PSP_POLL_TIMEOUT, // # of poll response timeouts IPW_ORD_STAT_PSP_POLL_TIMEOUT, // # of poll response timeouts
IPW_ORD_STAT_PSP_NONDIR_TIMEOUT,// # of timeouts waiting for last broadcast/muticast pkt IPW_ORD_STAT_PSP_NONDIR_TIMEOUT, // # of timeouts waiting for last broadcast/muticast pkt
IPW_ORD_STAT_PSP_RX_DTIMS, // # of PSP DTIMs received IPW_ORD_STAT_PSP_RX_DTIMS, // # of PSP DTIMs received
IPW_ORD_STAT_PSP_RX_TIMS, // # of PSP TIMs received IPW_ORD_STAT_PSP_RX_TIMS, // # of PSP TIMs received
IPW_ORD_STAT_PSP_STATION_ID, // PSP Station ID IPW_ORD_STAT_PSP_STATION_ID, // PSP Station ID
// Association and roaming // Association and roaming
IPW_ORD_LAST_ASSN_TIME = 147, // RTC time of last association IPW_ORD_LAST_ASSN_TIME = 147, // RTC time of last association
IPW_ORD_STAT_PERCENT_MISSED_BCNS,// current calculation of % missed beacons IPW_ORD_STAT_PERCENT_MISSED_BCNS, // current calculation of % missed beacons
IPW_ORD_STAT_PERCENT_RETRIES, // current calculation of % missed tx retries IPW_ORD_STAT_PERCENT_RETRIES, // current calculation of % missed tx retries
IPW_ORD_ASSOCIATED_AP_PTR, // If associated, this is ptr to the associated IPW_ORD_ASSOCIATED_AP_PTR, // If associated, this is ptr to the associated
// AP table entry. set to 0 if not associated // AP table entry. set to 0 if not associated
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7