You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Conflicts: drivers/net/wireless/iwlwifi/iwl-commands.h
This commit is contained in:
John W. Linville
@@ -5229,7 +5229,7 @@ struct security_info_params {
|
||||
u8 auth_mode;
|
||||
u8 replay_counters_number;
|
||||
u8 unicast_using_group;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
static int ipw2100_set_security_information(struct ipw2100_priv *priv,
|
||||
int auth_mode,
|
||||
@@ -8471,7 +8471,7 @@ struct ipw2100_fw_header {
|
||||
short mode;
|
||||
unsigned int fw_size;
|
||||
unsigned int uc_size;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
static int ipw2100_mod_firmware_load(struct ipw2100_fw *fw)
|
||||
{
|
||||
|
||||
@@ -164,7 +164,7 @@ struct bd_status {
|
||||
} fields;
|
||||
u8 field;
|
||||
} info;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw2100_bd {
|
||||
u32 host_addr;
|
||||
@@ -174,7 +174,7 @@ struct ipw2100_bd {
|
||||
* 1st TBD) */
|
||||
u8 num_fragments;
|
||||
u8 reserved[6];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define IPW_BD_QUEUE_LENGTH(n) (1<<n)
|
||||
#define IPW_BD_ALIGNMENT(L) (L*sizeof(struct ipw2100_bd))
|
||||
@@ -232,7 +232,7 @@ struct ipw2100_status {
|
||||
#define IPW_STATUS_FLAG_WEP_ENCRYPTED (1<<1)
|
||||
#define IPW_STATUS_FLAG_CRC_ERROR (1<<2)
|
||||
u8 rssi;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw2100_status_queue {
|
||||
/* driver (virtual) pointer to queue */
|
||||
@@ -293,7 +293,7 @@ struct ipw2100_cmd_header {
|
||||
u32 reserved1[3];
|
||||
u32 *ordinal1_ptr;
|
||||
u32 *ordinal2_ptr;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw2100_data_header {
|
||||
u32 host_command_reg;
|
||||
@@ -307,7 +307,7 @@ struct ipw2100_data_header {
|
||||
u8 src_addr[ETH_ALEN];
|
||||
u8 dst_addr[ETH_ALEN];
|
||||
u16 fragment_size;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/* Host command data structure */
|
||||
struct host_command {
|
||||
@@ -316,7 +316,7 @@ struct host_command {
|
||||
u32 host_command_sequence; // UNIQUE COMMAND NUMBER (ID)
|
||||
u32 host_command_length; // LENGTH
|
||||
u32 host_command_parameters[HOST_COMMAND_PARAMS_REG_LEN]; // COMMAND PARAMETERS
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
typedef enum {
|
||||
POWER_ON_RESET,
|
||||
@@ -382,7 +382,7 @@ struct ipw2100_notification {
|
||||
u32 hnhdr_size; /* size in bytes of data
|
||||
or number of entries, if table.
|
||||
Does NOT include header */
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define MAX_KEY_SIZE 16
|
||||
#define MAX_KEYS 8
|
||||
@@ -814,7 +814,7 @@ struct ipw2100_rx {
|
||||
struct ipw2100_notification notification;
|
||||
struct ipw2100_cmd_header command;
|
||||
} rx_data;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/* Bit 0-7 are for 802.11b tx rates - . Bit 5-7 are reserved */
|
||||
#define TX_RATE_1_MBIT 0x0001
|
||||
|
||||
@@ -388,7 +388,7 @@ struct clx2_queue {
|
||||
dma_addr_t dma_addr; /**< physical addr for BD's */
|
||||
int low_mark; /**< low watermark, resume queue if free space more than this */
|
||||
int high_mark; /**< high watermark, stop queue if free space less than this */
|
||||
} __attribute__ ((packed)); /* XXX */
|
||||
} __packed; /* XXX */
|
||||
|
||||
struct machdr32 {
|
||||
__le16 frame_ctl;
|
||||
@@ -399,7 +399,7 @@ struct machdr32 {
|
||||
__le16 seq_ctrl; // more endians!
|
||||
u8 addr4[MACADRR_BYTE_LEN];
|
||||
__le16 qos_ctrl;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct machdr30 {
|
||||
__le16 frame_ctl;
|
||||
@@ -409,7 +409,7 @@ struct machdr30 {
|
||||
u8 addr3[MACADRR_BYTE_LEN];
|
||||
__le16 seq_ctrl; // more endians!
|
||||
u8 addr4[MACADRR_BYTE_LEN];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct machdr26 {
|
||||
__le16 frame_ctl;
|
||||
@@ -419,7 +419,7 @@ struct machdr26 {
|
||||
u8 addr3[MACADRR_BYTE_LEN];
|
||||
__le16 seq_ctrl; // more endians!
|
||||
__le16 qos_ctrl;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct machdr24 {
|
||||
__le16 frame_ctl;
|
||||
@@ -428,20 +428,20 @@ struct machdr24 {
|
||||
u8 addr2[MACADRR_BYTE_LEN];
|
||||
u8 addr3[MACADRR_BYTE_LEN];
|
||||
__le16 seq_ctrl; // more endians!
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
// TX TFD with 32 byte MAC Header
|
||||
struct tx_tfd_32 {
|
||||
struct machdr32 mchdr; // 32
|
||||
__le32 uivplaceholder[2]; // 8
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
// TX TFD with 30 byte MAC Header
|
||||
struct tx_tfd_30 {
|
||||
struct machdr30 mchdr; // 30
|
||||
u8 reserved[2]; // 2
|
||||
__le32 uivplaceholder[2]; // 8
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
// tx tfd with 26 byte mac header
|
||||
struct tx_tfd_26 {
|
||||
@@ -449,14 +449,14 @@ struct tx_tfd_26 {
|
||||
u8 reserved1[2]; // 2
|
||||
__le32 uivplaceholder[2]; // 8
|
||||
u8 reserved2[4]; // 4
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
// tx tfd with 24 byte mac header
|
||||
struct tx_tfd_24 {
|
||||
struct machdr24 mchdr; // 24
|
||||
__le32 uivplaceholder[2]; // 8
|
||||
u8 reserved[8]; // 8
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define DCT_WEP_KEY_FIELD_LENGTH 16
|
||||
|
||||
@@ -465,7 +465,7 @@ struct tfd_command {
|
||||
u8 length;
|
||||
__le16 reserved;
|
||||
u8 payload[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct tfd_data {
|
||||
/* Header */
|
||||
@@ -504,14 +504,14 @@ struct tfd_data {
|
||||
__le32 num_chunks;
|
||||
__le32 chunk_ptr[NUM_TFD_CHUNKS];
|
||||
__le16 chunk_len[NUM_TFD_CHUNKS];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct txrx_control_flags {
|
||||
u8 message_type;
|
||||
u8 rx_seq_num;
|
||||
u8 control_bits;
|
||||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define TFD_SIZE 128
|
||||
#define TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH (TFD_SIZE - sizeof(struct txrx_control_flags))
|
||||
@@ -523,7 +523,7 @@ struct tfd_frame {
|
||||
struct tfd_command cmd;
|
||||
u8 raw[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
|
||||
} u;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
typedef void destructor_func(const void *);
|
||||
|
||||
@@ -559,7 +559,7 @@ struct rate_histogram {
|
||||
__le32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
|
||||
__le32 g[SUP_RATE_11G_MAX_NUM_CHANNELS];
|
||||
} failed;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/* statistics command response */
|
||||
struct ipw_cmd_stats {
|
||||
@@ -586,13 +586,13 @@ struct ipw_cmd_stats {
|
||||
__le16 rx_autodetec_no_ofdm;
|
||||
__le16 rx_autodetec_no_barker;
|
||||
__le16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct notif_channel_result {
|
||||
u8 channel_num;
|
||||
struct ipw_cmd_stats stats;
|
||||
u8 uReserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define SCAN_COMPLETED_STATUS_COMPLETE 1
|
||||
#define SCAN_COMPLETED_STATUS_ABORTED 2
|
||||
@@ -602,24 +602,24 @@ struct notif_scan_complete {
|
||||
u8 num_channels;
|
||||
u8 status;
|
||||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct notif_frag_length {
|
||||
__le16 frag_length;
|
||||
__le16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct notif_beacon_state {
|
||||
__le32 state;
|
||||
__le32 number;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct notif_tgi_tx_key {
|
||||
u8 key_state;
|
||||
u8 security_type;
|
||||
u8 station_index;
|
||||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define SILENCE_OVER_THRESH (1)
|
||||
#define SILENCE_UNDER_THRESH (2)
|
||||
@@ -631,25 +631,25 @@ struct notif_link_deterioration {
|
||||
struct rate_histogram histogram;
|
||||
u8 silence_notification_type; /* SILENCE_OVER/UNDER_THRESH */
|
||||
__le16 silence_count;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct notif_association {
|
||||
u8 state;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct notif_authenticate {
|
||||
u8 state;
|
||||
struct machdr24 addr;
|
||||
__le16 status;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct notif_calibration {
|
||||
u8 data[104];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct notif_noise {
|
||||
__le32 value;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_rx_notification {
|
||||
u8 reserved[8];
|
||||
@@ -669,7 +669,7 @@ struct ipw_rx_notification {
|
||||
struct notif_noise noise;
|
||||
u8 raw[0];
|
||||
} u;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_rx_frame {
|
||||
__le32 reserved1;
|
||||
@@ -692,14 +692,14 @@ struct ipw_rx_frame {
|
||||
u8 rtscts_seen; // 0x1 RTS seen ; 0x2 CTS seen
|
||||
__le16 length;
|
||||
u8 data[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_rx_header {
|
||||
u8 message_type;
|
||||
u8 rx_seq_num;
|
||||
u8 control_bits;
|
||||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_rx_packet {
|
||||
struct ipw_rx_header header;
|
||||
@@ -707,7 +707,7 @@ struct ipw_rx_packet {
|
||||
struct ipw_rx_frame frame;
|
||||
struct ipw_rx_notification notification;
|
||||
} u;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define IPW_RX_NOTIFICATION_SIZE sizeof(struct ipw_rx_header) + 12
|
||||
#define IPW_RX_FRAME_SIZE (unsigned int)(sizeof(struct ipw_rx_header) + \
|
||||
@@ -717,7 +717,7 @@ struct ipw_rx_mem_buffer {
|
||||
dma_addr_t dma_addr;
|
||||
struct sk_buff *skb;
|
||||
struct list_head list;
|
||||
}; /* Not transferred over network, so not __attribute__ ((packed)) */
|
||||
}; /* Not transferred over network, so not __packed */
|
||||
|
||||
struct ipw_rx_queue {
|
||||
struct ipw_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
|
||||
@@ -730,7 +730,7 @@ struct ipw_rx_queue {
|
||||
struct list_head rx_free; /* Own an SKBs */
|
||||
struct list_head rx_used; /* No SKB allocated */
|
||||
spinlock_t lock;
|
||||
}; /* Not transferred over network, so not __attribute__ ((packed)) */
|
||||
}; /* Not transferred over network, so not __packed */
|
||||
|
||||
struct alive_command_responce {
|
||||
u8 alive_command;
|
||||
@@ -745,21 +745,21 @@ struct alive_command_responce {
|
||||
__le16 reserved4;
|
||||
u8 time_stamp[5]; /* month, day, year, hours, minutes */
|
||||
u8 ucode_valid;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define IPW_MAX_RATES 12
|
||||
|
||||
struct ipw_rates {
|
||||
u8 num_rates;
|
||||
u8 rates[IPW_MAX_RATES];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct command_block {
|
||||
unsigned int control;
|
||||
u32 source_addr;
|
||||
u32 dest_addr;
|
||||
unsigned int status;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define CB_NUMBER_OF_ELEMENTS_SMALL 64
|
||||
struct fw_image_desc {
|
||||
@@ -792,7 +792,7 @@ struct ipw_sys_config {
|
||||
u8 accept_all_mgmt_frames;
|
||||
u8 pass_noise_stats_to_host;
|
||||
u8 reserved3;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_multicast_addr {
|
||||
u8 num_of_multicast_addresses;
|
||||
@@ -801,7 +801,7 @@ struct ipw_multicast_addr {
|
||||
u8 mac2[6];
|
||||
u8 mac3[6];
|
||||
u8 mac4[6];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define DCW_WEP_KEY_INDEX_MASK 0x03 /* bits [0:1] */
|
||||
#define DCW_WEP_KEY_SEC_TYPE_MASK 0x30 /* bits [4:5] */
|
||||
@@ -822,7 +822,7 @@ struct ipw_wep_key {
|
||||
u8 key_index;
|
||||
u8 key_size;
|
||||
u8 key[16];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_tgi_tx_key {
|
||||
u8 key_id;
|
||||
@@ -831,7 +831,7 @@ struct ipw_tgi_tx_key {
|
||||
u8 flags;
|
||||
u8 key[16];
|
||||
__le32 tx_counter[2];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define IPW_SCAN_CHANNELS 54
|
||||
|
||||
@@ -840,7 +840,7 @@ struct ipw_scan_request {
|
||||
__le16 dwell_time;
|
||||
u8 channels_list[IPW_SCAN_CHANNELS];
|
||||
u8 channels_reserved[3];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
enum {
|
||||
IPW_SCAN_PASSIVE_TILL_FIRST_BEACON_SCAN = 0,
|
||||
@@ -857,7 +857,7 @@ struct ipw_scan_request_ext {
|
||||
u8 scan_type[IPW_SCAN_CHANNELS / 2];
|
||||
u8 reserved;
|
||||
__le16 dwell_time[IPW_SCAN_TYPES];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
static inline u8 ipw_get_scan_type(struct ipw_scan_request_ext *scan, u8 index)
|
||||
{
|
||||
@@ -902,7 +902,7 @@ struct ipw_associate {
|
||||
u8 smr;
|
||||
u8 reserved1;
|
||||
__le16 reserved2;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_supported_rates {
|
||||
u8 ieee_mode;
|
||||
@@ -910,36 +910,36 @@ struct ipw_supported_rates {
|
||||
u8 purpose;
|
||||
u8 reserved;
|
||||
u8 supported_rates[IPW_MAX_RATES];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_rts_threshold {
|
||||
__le16 rts_threshold;
|
||||
__le16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_frag_threshold {
|
||||
__le16 frag_threshold;
|
||||
__le16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_retry_limit {
|
||||
u8 short_retry_limit;
|
||||
u8 long_retry_limit;
|
||||
__le16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_dino_config {
|
||||
__le32 dino_config_addr;
|
||||
__le16 dino_config_size;
|
||||
u8 dino_response;
|
||||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_aironet_info {
|
||||
u8 id;
|
||||
u8 length;
|
||||
__le16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_rx_key {
|
||||
u8 station_index;
|
||||
@@ -950,25 +950,25 @@ struct ipw_rx_key {
|
||||
u8 station_address[6];
|
||||
u8 key_index;
|
||||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_country_channel_info {
|
||||
u8 first_channel;
|
||||
u8 no_channels;
|
||||
s8 max_tx_power;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_country_info {
|
||||
u8 id;
|
||||
u8 length;
|
||||
u8 country_str[3];
|
||||
struct ipw_country_channel_info groups[7];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_channel_tx_power {
|
||||
u8 channel_number;
|
||||
s8 tx_power;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define SCAN_ASSOCIATED_INTERVAL (HZ)
|
||||
#define SCAN_INTERVAL (HZ / 10)
|
||||
@@ -979,18 +979,18 @@ struct ipw_tx_power {
|
||||
u8 num_channels;
|
||||
u8 ieee_mode;
|
||||
struct ipw_channel_tx_power channels_tx_power[MAX_A_CHANNELS];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_rsn_capabilities {
|
||||
u8 id;
|
||||
u8 length;
|
||||
__le16 version;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_sensitivity_calib {
|
||||
__le16 beacon_rssi_raw;
|
||||
__le16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/**
|
||||
* Host command structure.
|
||||
@@ -1019,7 +1019,7 @@ struct ipw_cmd { /* XXX */
|
||||
* nParams=(len+3)/4+status_len
|
||||
*/
|
||||
u32 param[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define STATUS_HCMD_ACTIVE (1<<0) /**< host command in progress */
|
||||
|
||||
@@ -1114,7 +1114,7 @@ struct ipw_event { /* XXX */
|
||||
u32 event;
|
||||
u32 time;
|
||||
u32 data;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_fw_error { /* XXX */
|
||||
unsigned long jiffies;
|
||||
@@ -1125,7 +1125,7 @@ struct ipw_fw_error { /* XXX */
|
||||
struct ipw_error_elem *elem;
|
||||
struct ipw_event *log;
|
||||
u8 payload[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#ifdef CONFIG_IPW2200_PROMISCUOUS
|
||||
|
||||
@@ -1170,7 +1170,7 @@ struct ipw_rt_hdr {
|
||||
s8 rt_dbmnoise;
|
||||
u8 rt_antenna; /* antenna number */
|
||||
u8 payload[0]; /* payload... */
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
#endif
|
||||
|
||||
struct ipw_priv {
|
||||
@@ -1957,7 +1957,7 @@ enum {
|
||||
struct ipw_fixed_rate {
|
||||
__le16 tx_rates;
|
||||
__le16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define IPW_INDIRECT_ADDR_MASK (~0x3ul)
|
||||
|
||||
@@ -1966,14 +1966,14 @@ struct host_cmd {
|
||||
u8 len;
|
||||
u16 reserved;
|
||||
u32 *param;
|
||||
} __attribute__ ((packed)); /* XXX */
|
||||
} __packed; /* XXX */
|
||||
|
||||
struct cmdlog_host_cmd {
|
||||
u8 cmd;
|
||||
u8 len;
|
||||
__le16 reserved;
|
||||
char param[124];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct ipw_cmd_log {
|
||||
unsigned long jiffies;
|
||||
|
||||
@@ -154,7 +154,7 @@ struct libipw_snap_hdr {
|
||||
u8 ctrl; /* always 0x03 */
|
||||
u8 oui[P80211_OUI_LEN]; /* organizational universal id */
|
||||
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
#define SNAP_SIZE sizeof(struct libipw_snap_hdr)
|
||||
|
||||
@@ -323,7 +323,7 @@ struct libipw_security {
|
||||
u8 keys[WEP_KEYS][SCM_KEY_LEN];
|
||||
u8 level;
|
||||
u16 flags;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/*
|
||||
|
||||
@@ -347,7 +347,7 @@ struct libipw_hdr_1addr {
|
||||
__le16 duration_id;
|
||||
u8 addr1[ETH_ALEN];
|
||||
u8 payload[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_hdr_2addr {
|
||||
__le16 frame_ctl;
|
||||
@@ -355,7 +355,7 @@ struct libipw_hdr_2addr {
|
||||
u8 addr1[ETH_ALEN];
|
||||
u8 addr2[ETH_ALEN];
|
||||
u8 payload[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_hdr_3addr {
|
||||
__le16 frame_ctl;
|
||||
@@ -365,7 +365,7 @@ struct libipw_hdr_3addr {
|
||||
u8 addr3[ETH_ALEN];
|
||||
__le16 seq_ctl;
|
||||
u8 payload[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_hdr_4addr {
|
||||
__le16 frame_ctl;
|
||||
@@ -376,7 +376,7 @@ struct libipw_hdr_4addr {
|
||||
__le16 seq_ctl;
|
||||
u8 addr4[ETH_ALEN];
|
||||
u8 payload[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_hdr_3addrqos {
|
||||
__le16 frame_ctl;
|
||||
@@ -387,13 +387,13 @@ struct libipw_hdr_3addrqos {
|
||||
__le16 seq_ctl;
|
||||
u8 payload[0];
|
||||
__le16 qos_ctl;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_info_element {
|
||||
u8 id;
|
||||
u8 len;
|
||||
u8 data[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/*
|
||||
* These are the data types that can make up management packets
|
||||
@@ -406,7 +406,7 @@ struct libipw_info_element {
|
||||
u16 listen_interval;
|
||||
struct {
|
||||
u16 association_id:14, reserved:2;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
u32 time_stamp[2];
|
||||
u16 reason;
|
||||
u16 status;
|
||||
@@ -419,7 +419,7 @@ struct libipw_auth {
|
||||
__le16 status;
|
||||
/* challenge */
|
||||
struct libipw_info_element info_element[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_channel_switch {
|
||||
u8 id;
|
||||
@@ -427,7 +427,7 @@ struct libipw_channel_switch {
|
||||
u8 mode;
|
||||
u8 channel;
|
||||
u8 count;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_action {
|
||||
struct libipw_hdr_3addr header;
|
||||
@@ -441,12 +441,12 @@ struct libipw_action {
|
||||
struct libipw_channel_switch channel_switch;
|
||||
|
||||
} format;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_disassoc {
|
||||
struct libipw_hdr_3addr header;
|
||||
__le16 reason;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/* Alias deauth for disassoc */
|
||||
#define libipw_deauth libipw_disassoc
|
||||
@@ -455,7 +455,7 @@ struct libipw_probe_request {
|
||||
struct libipw_hdr_3addr header;
|
||||
/* SSID, supported rates */
|
||||
struct libipw_info_element info_element[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_probe_response {
|
||||
struct libipw_hdr_3addr header;
|
||||
@@ -465,7 +465,7 @@ struct libipw_probe_response {
|
||||
/* SSID, supported rates, FH params, DS params,
|
||||
* CF params, IBSS params, TIM (if beacon), RSN */
|
||||
struct libipw_info_element info_element[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/* Alias beacon for probe_response */
|
||||
#define libipw_beacon libipw_probe_response
|
||||
@@ -476,7 +476,7 @@ struct libipw_assoc_request {
|
||||
__le16 listen_interval;
|
||||
/* SSID, supported rates, RSN */
|
||||
struct libipw_info_element info_element[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_reassoc_request {
|
||||
struct libipw_hdr_3addr header;
|
||||
@@ -484,7 +484,7 @@ struct libipw_reassoc_request {
|
||||
__le16 listen_interval;
|
||||
u8 current_ap[ETH_ALEN];
|
||||
struct libipw_info_element info_element[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_assoc_response {
|
||||
struct libipw_hdr_3addr header;
|
||||
@@ -493,7 +493,7 @@ struct libipw_assoc_response {
|
||||
__le16 aid;
|
||||
/* supported rates */
|
||||
struct libipw_info_element info_element[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_txb {
|
||||
u8 nr_frags;
|
||||
@@ -555,19 +555,19 @@ struct libipw_qos_information_element {
|
||||
u8 qui_subtype;
|
||||
u8 version;
|
||||
u8 ac_info;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_qos_ac_parameter {
|
||||
u8 aci_aifsn;
|
||||
u8 ecw_min_max;
|
||||
__le16 tx_op_limit;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_qos_parameter_info {
|
||||
struct libipw_qos_information_element info_element;
|
||||
u8 reserved;
|
||||
struct libipw_qos_ac_parameter ac_params_record[QOS_QUEUE_NUM];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_qos_parameters {
|
||||
__le16 cw_min[QOS_QUEUE_NUM];
|
||||
@@ -575,7 +575,7 @@ struct libipw_qos_parameters {
|
||||
u8 aifs[QOS_QUEUE_NUM];
|
||||
u8 flag[QOS_QUEUE_NUM];
|
||||
__le16 tx_op_limit[QOS_QUEUE_NUM];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_qos_data {
|
||||
struct libipw_qos_parameters parameters;
|
||||
@@ -588,7 +588,7 @@ struct libipw_qos_data {
|
||||
struct libipw_tim_parameters {
|
||||
u8 tim_count;
|
||||
u8 tim_period;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
/*******************************************************/
|
||||
|
||||
@@ -606,7 +606,7 @@ struct libipw_basic_report {
|
||||
__le64 start_time;
|
||||
__le16 duration;
|
||||
u8 map;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
enum { /* libipw_measurement_request.mode */
|
||||
/* Bit 0 is reserved */
|
||||
@@ -627,7 +627,7 @@ struct libipw_measurement_params {
|
||||
u8 channel;
|
||||
__le64 start_time;
|
||||
__le16 duration;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_measurement_request {
|
||||
struct libipw_info_element ie;
|
||||
@@ -635,7 +635,7 @@ struct libipw_measurement_request {
|
||||
u8 mode;
|
||||
u8 type;
|
||||
struct libipw_measurement_params params[0];
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_measurement_report {
|
||||
struct libipw_info_element ie;
|
||||
@@ -645,17 +645,17 @@ struct libipw_measurement_report {
|
||||
union {
|
||||
struct libipw_basic_report basic[0];
|
||||
} u;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_tpc_report {
|
||||
u8 transmit_power;
|
||||
u8 link_margin;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_channel_map {
|
||||
u8 channel;
|
||||
u8 map;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_ibss_dfs {
|
||||
struct libipw_info_element ie;
|
||||
@@ -668,14 +668,14 @@ struct libipw_csa {
|
||||
u8 mode;
|
||||
u8 channel;
|
||||
u8 count;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_quiet {
|
||||
u8 count;
|
||||
u8 period;
|
||||
u8 duration;
|
||||
u8 offset;
|
||||
} __attribute__ ((packed));
|
||||
} __packed;
|
||||
|
||||
struct libipw_network {
|
||||
/* These entries are used to identify a unique network */
|
||||
|
||||
Reference in New Issue
Block a user