aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Guenther <agx@sigxcpu.org>2007-02-21 19:39:58 +0100
committerGuido Guenther <agx@bogon.sigxcpu.org>2007-02-21 19:39:58 +0100
commitd5359cae6ea2df42a14344c20ad5f9cd54fb4744 (patch)
treef27e85b9e5517883494d2e6fdf062c60bd287ae3
parentc97917e4d9b7eee56488d166e70dc760e0a9a0c4 (diff)
reformat a bit
-rw-r--r--at76c503.h46
1 files changed, 22 insertions, 24 deletions
diff --git a/at76c503.h b/at76c503.h
index 86e3f71..b1cb3e5 100644
--- a/at76c503.h
+++ b/at76c503.h
@@ -470,7 +470,7 @@ struct at76c503 {
struct sk_buff * rx_skb; /* skbuff for receiving packets */
__u8 bulk_in_endpointAddr; /* the address of the bulk in endpoint */
- unsigned char * bulk_out_buffer; /* the buffer to send data */
+ unsigned char * bulk_out_buffer; /* the buffer to send data */
int bulk_out_size; /* the size of the send buffer */
struct urb * write_urb; /* the urb used to send data */
struct urb * read_urb;
@@ -492,8 +492,8 @@ struct at76c503 {
u8 op_mode;
/* the WEP stuff */
- int wep_enabled; /* 1 if WEP is enabled */
- int wep_key_id; /* key id to be used */
+ int wep_enabled; /* 1 if WEP is enabled */
+ int wep_key_id; /* key id to be used */
u8 wep_keys[WEP_KEYS][WEP_KEY_LEN]; /* the four WEP keys,
5 or 13 bytes are used */
u8 wep_keys_len[WEP_KEYS]; /* the length of the above keys */
@@ -508,22 +508,22 @@ struct at76c503 {
int radio_on;
int promisc;
- int preamble_type; /* 0 - long preamble, 1 - short preamble */
- int auth_mode; /* authentication type: 0 open, 1 shared key */
- int txrate; /* 0,1,2,3 = 1,2,5.5,11 MBit, 4 is auto-fallback */
+ int preamble_type; /* 0 - long preamble, 1 - short preamble */
+ int auth_mode; /* authentication type: 0 open, 1 shared key */
+ int txrate; /* 0,1,2,3 = 1,2,5.5,11 MBit, 4 is auto-fallback */
int frag_threshold; /* threshold for fragmentation of tx packets */
- int rts_threshold; /* threshold for RTS mechanism */
+ int rts_threshold; /* threshold for RTS mechanism */
int short_retry_limit;
//int long_retry_limit;
- int scan_min_time; /* scan min channel time */
- int scan_max_time; /* scan max channel time */
- int scan_mode; /* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */
- int scan_runs; /* counts how many scans are started */
+ int scan_min_time; /* scan min channel time */
+ int scan_max_time; /* scan max channel time */
+ int scan_mode; /* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */
+ int scan_runs; /* counts how many scans are started */
/* the list we got from scanning */
spinlock_t bss_list_spinlock; /* protects bss_list operations and setting
- curr_bss and new_bss */
+ curr_bss and new_bss */
struct list_head bss_list; /* the list of bss we received beacons from */
struct timer_list bss_list_timer; /* a timer removing old entries from
the bss_list. It must acquire bss_list_spinlock
@@ -532,21 +532,21 @@ struct at76c503 {
struct bss_info *curr_bss; /* if istate == AUTH, ASSOC, REASSOC, JOIN or CONN
dev->bss[curr_bss] is the currently selected BSS
we operate on */
- struct bss_info *new_bss; /* if istate == REASSOC dev->new_bss
- is the new bss we want to reassoc to */
+ struct bss_info *new_bss; /* if istate == REASSOC dev->new_bss
+ is the new bss we want to reassoc to */
u8 wanted_bssid[ETH_ALEN];
- int wanted_bssid_valid; /* != 0 if wanted_bssid is to be used */
+ int wanted_bssid_valid; /* != 0 if wanted_bssid is to be used */
/* some data for infrastructure mode only */
- spinlock_t mgmt_spinlock; /* this spinlock protects access to
- next_mgmt_bulk */
+ spinlock_t mgmt_spinlock; /* this spinlock protects access to
+ next_mgmt_bulk */
spinlock_t istate_spinlock; /* this spinlock protects access to
- istate */
+ istate */
struct at76c503_tx_buffer *next_mgmt_bulk; /* pending management msg to
- send via bulk out */
+ send via bulk out */
enum infra_state istate;
enum {
SITE_SURVEY_IDLE,
@@ -558,10 +558,10 @@ struct at76c503 {
struct timer_list restart_timer; /* the timer we use to delay the restart a bit */
struct timer_list mgmt_timer; /* the timer we use to repeat auth_req etc. */
- int retries; /* counts backwards while re-trying to send auth/assoc_req's */
+ int retries; /* counts backwards while re-trying to send auth/assoc_req's */
u16 assoc_id; /* the assoc_id for states JOINING, REASSOCIATING, CONNECTED */
u8 pm_mode ; /* power management mode: ACTIVE, SAVE, SMART_SAVE */
- u32 pm_period_us; /* power manag. period (in us ?) - set by iwconfig */
+ u32 pm_period_us; /* power manag. period (in us ?) - set by iwconfig */
u32 pm_period_beacon; /* power manag. period (in beacon intervals
of the curr_bss) */
u32 board_type; /* BOARDTYPE_* defined above*/
@@ -572,9 +572,7 @@ struct at76c503 {
spinlock_t spy_spinlock;
struct iw_spy_data spy_data;
-#if WIRELESS_EXT > 16
struct iw_public_data wireless_data;
-#endif /* WIRELESS_EXT > 16 */
/* These fields contain HW config provided by the device (not all of
* these fields are used by all board types) */
@@ -611,7 +609,7 @@ struct at76c503 {
unsigned int device_unplugged:1;
unsigned int netdev_registered:1;
char obuf[2*256+1]; /* global debug output buffer to reduce stack usage */
- char obuf_s[3*32]; /* small global debug output buffer to reduce stack usage */
+ char obuf_s[3*32]; /* small global debug output buffer to reduce stack usage */
struct set_mib_buffer mib_buf; /* global buffer for set_mib calls */
/* new whiz-bang feature flags */