diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2007-12-27 01:36:46 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:09:09 -0500 |
commit | e62e1ee02900bc315d7aeba55196a78f8f62f1c5 (patch) | |
tree | fc13df4b5baa4290121300996ac63d479be60824 /drivers/net/wireless/ipw2200.h | |
parent | 0569056e0d355f5b9a45c5b16a9b0b65718d077e (diff) |
ipw2200 trivial annotations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2200.h')
-rw-r--r-- | drivers/net/wireless/ipw2200.h | 94 |
1 files changed, 47 insertions, 47 deletions
diff --git a/drivers/net/wireless/ipw2200.h b/drivers/net/wireless/ipw2200.h index b8e815a42be8..fae57a9f8be4 100644 --- a/drivers/net/wireless/ipw2200.h +++ b/drivers/net/wireless/ipw2200.h | |||
@@ -388,18 +388,18 @@ struct clx2_queue { | |||
388 | } __attribute__ ((packed)); | 388 | } __attribute__ ((packed)); |
389 | 389 | ||
390 | struct machdr32 { | 390 | struct machdr32 { |
391 | u16 frame_ctl; | 391 | __le16 frame_ctl; |
392 | u16 duration; // watch out for endians! | 392 | u16 duration; // watch out for endians! |
393 | u8 addr1[MACADRR_BYTE_LEN]; | 393 | u8 addr1[MACADRR_BYTE_LEN]; |
394 | u8 addr2[MACADRR_BYTE_LEN]; | 394 | u8 addr2[MACADRR_BYTE_LEN]; |
395 | u8 addr3[MACADRR_BYTE_LEN]; | 395 | u8 addr3[MACADRR_BYTE_LEN]; |
396 | u16 seq_ctrl; // more endians! | 396 | u16 seq_ctrl; // more endians! |
397 | u8 addr4[MACADRR_BYTE_LEN]; | 397 | u8 addr4[MACADRR_BYTE_LEN]; |
398 | u16 qos_ctrl; | 398 | __le16 qos_ctrl; |
399 | } __attribute__ ((packed)); | 399 | } __attribute__ ((packed)); |
400 | 400 | ||
401 | struct machdr30 { | 401 | struct machdr30 { |
402 | u16 frame_ctl; | 402 | __le16 frame_ctl; |
403 | u16 duration; // watch out for endians! | 403 | u16 duration; // watch out for endians! |
404 | u8 addr1[MACADRR_BYTE_LEN]; | 404 | u8 addr1[MACADRR_BYTE_LEN]; |
405 | u8 addr2[MACADRR_BYTE_LEN]; | 405 | u8 addr2[MACADRR_BYTE_LEN]; |
@@ -409,17 +409,17 @@ struct machdr30 { | |||
409 | } __attribute__ ((packed)); | 409 | } __attribute__ ((packed)); |
410 | 410 | ||
411 | struct machdr26 { | 411 | struct machdr26 { |
412 | u16 frame_ctl; | 412 | __le16 frame_ctl; |
413 | u16 duration; // watch out for endians! | 413 | u16 duration; // watch out for endians! |
414 | u8 addr1[MACADRR_BYTE_LEN]; | 414 | u8 addr1[MACADRR_BYTE_LEN]; |
415 | u8 addr2[MACADRR_BYTE_LEN]; | 415 | u8 addr2[MACADRR_BYTE_LEN]; |
416 | u8 addr3[MACADRR_BYTE_LEN]; | 416 | u8 addr3[MACADRR_BYTE_LEN]; |
417 | u16 seq_ctrl; // more endians! | 417 | u16 seq_ctrl; // more endians! |
418 | u16 qos_ctrl; | 418 | __le16 qos_ctrl; |
419 | } __attribute__ ((packed)); | 419 | } __attribute__ ((packed)); |
420 | 420 | ||
421 | struct machdr24 { | 421 | struct machdr24 { |
422 | u16 frame_ctl; | 422 | __le16 frame_ctl; |
423 | u16 duration; // watch out for endians! | 423 | u16 duration; // watch out for endians! |
424 | u8 addr1[MACADRR_BYTE_LEN]; | 424 | u8 addr1[MACADRR_BYTE_LEN]; |
425 | u8 addr2[MACADRR_BYTE_LEN]; | 425 | u8 addr2[MACADRR_BYTE_LEN]; |
@@ -466,15 +466,15 @@ struct tfd_command { | |||
466 | 466 | ||
467 | struct tfd_data { | 467 | struct tfd_data { |
468 | /* Header */ | 468 | /* Header */ |
469 | u32 work_area_ptr; | 469 | __le32 work_area_ptr; |
470 | u8 station_number; /* 0 for BSS */ | 470 | u8 station_number; /* 0 for BSS */ |
471 | u8 reserved1; | 471 | u8 reserved1; |
472 | u16 reserved2; | 472 | __le16 reserved2; |
473 | 473 | ||
474 | /* Tx Parameters */ | 474 | /* Tx Parameters */ |
475 | u8 cmd_id; | 475 | u8 cmd_id; |
476 | u8 seq_num; | 476 | u8 seq_num; |
477 | u16 len; | 477 | __le16 len; |
478 | u8 priority; | 478 | u8 priority; |
479 | u8 tx_flags; | 479 | u8 tx_flags; |
480 | u8 tx_flags_ext; | 480 | u8 tx_flags_ext; |
@@ -482,11 +482,11 @@ struct tfd_data { | |||
482 | u8 wepkey[DCT_WEP_KEY_FIELD_LENGTH]; | 482 | u8 wepkey[DCT_WEP_KEY_FIELD_LENGTH]; |
483 | u8 rate; | 483 | u8 rate; |
484 | u8 antenna; | 484 | u8 antenna; |
485 | u16 next_packet_duration; | 485 | __le16 next_packet_duration; |
486 | u16 next_frag_len; | 486 | __le16 next_frag_len; |
487 | u16 back_off_counter; //////txop; | 487 | __le16 back_off_counter; //////txop; |
488 | u8 retrylimit; | 488 | u8 retrylimit; |
489 | u16 cwcurrent; | 489 | __le16 cwcurrent; |
490 | u8 reserved3; | 490 | u8 reserved3; |
491 | 491 | ||
492 | /* 802.11 MAC Header */ | 492 | /* 802.11 MAC Header */ |
@@ -498,9 +498,9 @@ struct tfd_data { | |||
498 | } tfd; | 498 | } tfd; |
499 | 499 | ||
500 | /* Payload DMA info */ | 500 | /* Payload DMA info */ |
501 | u32 num_chunks; | 501 | __le32 num_chunks; |
502 | u32 chunk_ptr[NUM_TFD_CHUNKS]; | 502 | __le32 chunk_ptr[NUM_TFD_CHUNKS]; |
503 | u16 chunk_len[NUM_TFD_CHUNKS]; | 503 | __le16 chunk_len[NUM_TFD_CHUNKS]; |
504 | } __attribute__ ((packed)); | 504 | } __attribute__ ((packed)); |
505 | 505 | ||
506 | struct txrx_control_flags { | 506 | struct txrx_control_flags { |
@@ -547,14 +547,14 @@ struct clx2_tx_queue { | |||
547 | // Used for passing to driver number of successes and failures per rate | 547 | // Used for passing to driver number of successes and failures per rate |
548 | struct rate_histogram { | 548 | struct rate_histogram { |
549 | union { | 549 | union { |
550 | u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; | 550 | __le32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; |
551 | u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; | 551 | __le32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; |
552 | u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; | 552 | __le32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; |
553 | } success; | 553 | } success; |
554 | union { | 554 | union { |
555 | u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; | 555 | __le32 a[SUP_RATE_11A_MAX_NUM_CHANNELS]; |
556 | u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; | 556 | __le32 b[SUP_RATE_11B_MAX_NUM_CHANNELS]; |
557 | u32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; | 557 | __le32 g[SUP_RATE_11G_MAX_NUM_CHANNELS]; |
558 | } failed; | 558 | } failed; |
559 | } __attribute__ ((packed)); | 559 | } __attribute__ ((packed)); |
560 | 560 | ||
@@ -602,13 +602,13 @@ struct notif_scan_complete { | |||
602 | } __attribute__ ((packed)); | 602 | } __attribute__ ((packed)); |
603 | 603 | ||
604 | struct notif_frag_length { | 604 | struct notif_frag_length { |
605 | u16 frag_length; | 605 | __le16 frag_length; |
606 | u16 reserved; | 606 | __le16 reserved; |
607 | } __attribute__ ((packed)); | 607 | } __attribute__ ((packed)); |
608 | 608 | ||
609 | struct notif_beacon_state { | 609 | struct notif_beacon_state { |
610 | u32 state; | 610 | __le32 state; |
611 | u32 number; | 611 | __le32 number; |
612 | } __attribute__ ((packed)); | 612 | } __attribute__ ((packed)); |
613 | 613 | ||
614 | struct notif_tgi_tx_key { | 614 | struct notif_tgi_tx_key { |
@@ -627,7 +627,7 @@ struct notif_link_deterioration { | |||
627 | u8 modulation; | 627 | u8 modulation; |
628 | struct rate_histogram histogram; | 628 | struct rate_histogram histogram; |
629 | u8 silence_notification_type; /* SILENCE_OVER/UNDER_THRESH */ | 629 | u8 silence_notification_type; /* SILENCE_OVER/UNDER_THRESH */ |
630 | u16 silence_count; | 630 | __le16 silence_count; |
631 | } __attribute__ ((packed)); | 631 | } __attribute__ ((packed)); |
632 | 632 | ||
633 | struct notif_association { | 633 | struct notif_association { |
@@ -645,14 +645,14 @@ struct notif_calibration { | |||
645 | } __attribute__ ((packed)); | 645 | } __attribute__ ((packed)); |
646 | 646 | ||
647 | struct notif_noise { | 647 | struct notif_noise { |
648 | u32 value; | 648 | __le32 value; |
649 | } __attribute__ ((packed)); | 649 | } __attribute__ ((packed)); |
650 | 650 | ||
651 | struct ipw_rx_notification { | 651 | struct ipw_rx_notification { |
652 | u8 reserved[8]; | 652 | u8 reserved[8]; |
653 | u8 subtype; | 653 | u8 subtype; |
654 | u8 flags; | 654 | u8 flags; |
655 | u16 size; | 655 | __le16 size; |
656 | union { | 656 | union { |
657 | struct notif_association assoc; | 657 | struct notif_association assoc; |
658 | struct notif_authenticate auth; | 658 | struct notif_authenticate auth; |
@@ -669,7 +669,7 @@ struct ipw_rx_notification { | |||
669 | } __attribute__ ((packed)); | 669 | } __attribute__ ((packed)); |
670 | 670 | ||
671 | struct ipw_rx_frame { | 671 | struct ipw_rx_frame { |
672 | u32 reserved1; | 672 | __le32 reserved1; |
673 | u8 parent_tsf[4]; // fw_use[0] is boolean for OUR_TSF_IS_GREATER | 673 | u8 parent_tsf[4]; // fw_use[0] is boolean for OUR_TSF_IS_GREATER |
674 | u8 received_channel; // The channel that this frame was received on. | 674 | u8 received_channel; // The channel that this frame was received on. |
675 | // Note that for .11b this does not have to be | 675 | // Note that for .11b this does not have to be |
@@ -680,14 +680,14 @@ struct ipw_rx_frame { | |||
680 | u8 rssi; | 680 | u8 rssi; |
681 | u8 agc; | 681 | u8 agc; |
682 | u8 rssi_dbm; | 682 | u8 rssi_dbm; |
683 | u16 signal; | 683 | __le16 signal; |
684 | u16 noise; | 684 | __le16 noise; |
685 | u8 antennaAndPhy; | 685 | u8 antennaAndPhy; |
686 | u8 control; // control bit should be on in bg | 686 | u8 control; // control bit should be on in bg |
687 | u8 rtscts_rate; // rate of rts or cts (in rts cts sequence rate | 687 | u8 rtscts_rate; // rate of rts or cts (in rts cts sequence rate |
688 | // is identical) | 688 | // is identical) |
689 | u8 rtscts_seen; // 0x1 RTS seen ; 0x2 CTS seen | 689 | u8 rtscts_seen; // 0x1 RTS seen ; 0x2 CTS seen |
690 | u16 length; | 690 | __le16 length; |
691 | u8 data[0]; | 691 | u8 data[0]; |
692 | } __attribute__ ((packed)); | 692 | } __attribute__ ((packed)); |
693 | 693 | ||
@@ -827,14 +827,14 @@ struct ipw_tgi_tx_key { | |||
827 | u8 station_index; | 827 | u8 station_index; |
828 | u8 flags; | 828 | u8 flags; |
829 | u8 key[16]; | 829 | u8 key[16]; |
830 | u32 tx_counter[2]; | 830 | __le32 tx_counter[2]; |
831 | } __attribute__ ((packed)); | 831 | } __attribute__ ((packed)); |
832 | 832 | ||
833 | #define IPW_SCAN_CHANNELS 54 | 833 | #define IPW_SCAN_CHANNELS 54 |
834 | 834 | ||
835 | struct ipw_scan_request { | 835 | struct ipw_scan_request { |
836 | u8 scan_type; | 836 | u8 scan_type; |
837 | u16 dwell_time; | 837 | __le16 dwell_time; |
838 | u8 channels_list[IPW_SCAN_CHANNELS]; | 838 | u8 channels_list[IPW_SCAN_CHANNELS]; |
839 | u8 channels_reserved[3]; | 839 | u8 channels_reserved[3]; |
840 | } __attribute__ ((packed)); | 840 | } __attribute__ ((packed)); |
@@ -849,11 +849,11 @@ enum { | |||
849 | }; | 849 | }; |
850 | 850 | ||
851 | struct ipw_scan_request_ext { | 851 | struct ipw_scan_request_ext { |
852 | u32 full_scan_index; | 852 | __le32 full_scan_index; |
853 | u8 channels_list[IPW_SCAN_CHANNELS]; | 853 | u8 channels_list[IPW_SCAN_CHANNELS]; |
854 | u8 scan_type[IPW_SCAN_CHANNELS / 2]; | 854 | u8 scan_type[IPW_SCAN_CHANNELS / 2]; |
855 | u8 reserved; | 855 | u8 reserved; |
856 | u16 dwell_time[IPW_SCAN_TYPES]; | 856 | __le16 dwell_time[IPW_SCAN_TYPES]; |
857 | } __attribute__ ((packed)); | 857 | } __attribute__ ((packed)); |
858 | 858 | ||
859 | static inline u8 ipw_get_scan_type(struct ipw_scan_request_ext *scan, u8 index) | 859 | static inline u8 ipw_get_scan_type(struct ipw_scan_request_ext *scan, u8 index) |
@@ -906,13 +906,13 @@ struct ipw_supported_rates { | |||
906 | } __attribute__ ((packed)); | 906 | } __attribute__ ((packed)); |
907 | 907 | ||
908 | struct ipw_rts_threshold { | 908 | struct ipw_rts_threshold { |
909 | u16 rts_threshold; | 909 | __le16 rts_threshold; |
910 | u16 reserved; | 910 | __le16 reserved; |
911 | } __attribute__ ((packed)); | 911 | } __attribute__ ((packed)); |
912 | 912 | ||
913 | struct ipw_frag_threshold { | 913 | struct ipw_frag_threshold { |
914 | u16 frag_threshold; | 914 | __le16 frag_threshold; |
915 | u16 reserved; | 915 | __le16 reserved; |
916 | } __attribute__ ((packed)); | 916 | } __attribute__ ((packed)); |
917 | 917 | ||
918 | struct ipw_retry_limit { | 918 | struct ipw_retry_limit { |
@@ -931,7 +931,7 @@ struct ipw_dino_config { | |||
931 | struct ipw_aironet_info { | 931 | struct ipw_aironet_info { |
932 | u8 id; | 932 | u8 id; |
933 | u8 length; | 933 | u8 length; |
934 | u16 reserved; | 934 | __le16 reserved; |
935 | } __attribute__ ((packed)); | 935 | } __attribute__ ((packed)); |
936 | 936 | ||
937 | struct ipw_rx_key { | 937 | struct ipw_rx_key { |
@@ -977,12 +977,12 @@ struct ipw_tx_power { | |||
977 | struct ipw_rsn_capabilities { | 977 | struct ipw_rsn_capabilities { |
978 | u8 id; | 978 | u8 id; |
979 | u8 length; | 979 | u8 length; |
980 | u16 version; | 980 | __le16 version; |
981 | } __attribute__ ((packed)); | 981 | } __attribute__ ((packed)); |
982 | 982 | ||
983 | struct ipw_sensitivity_calib { | 983 | struct ipw_sensitivity_calib { |
984 | u16 beacon_rssi_raw; | 984 | __le16 beacon_rssi_raw; |
985 | u16 reserved; | 985 | __le16 reserved; |
986 | } __attribute__ ((packed)); | 986 | } __attribute__ ((packed)); |
987 | 987 | ||
988 | /** | 988 | /** |
@@ -1156,8 +1156,8 @@ struct ipw_rt_hdr { | |||
1156 | u64 rt_tsf; /* TSF */ | 1156 | u64 rt_tsf; /* TSF */ |
1157 | u8 rt_flags; /* radiotap packet flags */ | 1157 | u8 rt_flags; /* radiotap packet flags */ |
1158 | u8 rt_rate; /* rate in 500kb/s */ | 1158 | u8 rt_rate; /* rate in 500kb/s */ |
1159 | u16 rt_channel; /* channel in mhz */ | 1159 | __le16 rt_channel; /* channel in mhz */ |
1160 | u16 rt_chbitmask; /* channel bitfield */ | 1160 | __le16 rt_chbitmask; /* channel bitfield */ |
1161 | s8 rt_dbmsignal; /* signal in dbM, kluged to signed */ | 1161 | s8 rt_dbmsignal; /* signal in dbM, kluged to signed */ |
1162 | s8 rt_dbmnoise; | 1162 | s8 rt_dbmnoise; |
1163 | u8 rt_antenna; /* antenna number */ | 1163 | u8 rt_antenna; /* antenna number */ |