[wireless ieee80211,ipw2200] Lindent source code
No code changes, just Lindent + manual fixups. This prepares us for updating to the latest Intel driver code, plus gives the source code a nice facelift.
This commit is contained in:
parent
bbeec90b98
commit
0edd5b4491
File diff suppressed because it is too large
Load diff
|
@ -56,8 +56,7 @@
|
|||
#include <linux/workqueue.h>
|
||||
|
||||
/* Authentication and Association States */
|
||||
enum connection_manager_assoc_states
|
||||
{
|
||||
enum connection_manager_assoc_states {
|
||||
CMAS_INIT = 0,
|
||||
CMAS_TX_AUTH_SEQ_1,
|
||||
CMAS_RX_AUTH_SEQ_2,
|
||||
|
@ -74,7 +73,6 @@ enum connection_manager_assoc_states
|
|||
CMAS_LAST
|
||||
};
|
||||
|
||||
|
||||
#define IPW_WAIT (1<<0)
|
||||
#define IPW_QUIET (1<<1)
|
||||
#define IPW_ROAMING (1<<2)
|
||||
|
@ -190,7 +188,6 @@ enum connection_manager_assoc_states
|
|||
#define DCT_FLAG_EXT_MODE_CCK 0x01
|
||||
#define DCT_FLAG_EXT_MODE_OFDM 0x00
|
||||
|
||||
|
||||
#define TX_RX_TYPE_MASK 0xFF
|
||||
#define TX_FRAME_TYPE 0x00
|
||||
#define TX_HOST_COMMAND_TYPE 0x01
|
||||
|
@ -242,107 +239,97 @@ enum connection_manager_assoc_states
|
|||
* Contains common data for Rx and Tx queues
|
||||
*/
|
||||
struct clx2_queue {
|
||||
int n_bd; /**< number of BDs in this queue */
|
||||
int first_empty; /**< 1-st empty entry (index) */
|
||||
int last_used; /**< last used entry (index) */
|
||||
u32 reg_w; /**< 'write' reg (queue head), addr in domain 1 */
|
||||
u32 reg_r; /**< 'read' reg (queue tail), addr in domain 1 */
|
||||
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 */
|
||||
int n_bd; /**< number of BDs in this queue */
|
||||
int first_empty; /**< 1-st empty entry (index) */
|
||||
int last_used; /**< last used entry (index) */
|
||||
u32 reg_w; /**< 'write' reg (queue head), addr in domain 1 */
|
||||
u32 reg_r; /**< 'read' reg (queue tail), addr in domain 1 */
|
||||
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));
|
||||
|
||||
struct machdr32
|
||||
{
|
||||
struct machdr32 {
|
||||
u16 frame_ctl;
|
||||
u16 duration; // watch out for endians!
|
||||
u8 addr1[ MACADRR_BYTE_LEN ];
|
||||
u8 addr2[ MACADRR_BYTE_LEN ];
|
||||
u8 addr3[ MACADRR_BYTE_LEN ];
|
||||
u16 seq_ctrl; // more endians!
|
||||
u8 addr4[ MACADRR_BYTE_LEN ];
|
||||
u16 duration; // watch out for endians!
|
||||
u8 addr1[MACADRR_BYTE_LEN];
|
||||
u8 addr2[MACADRR_BYTE_LEN];
|
||||
u8 addr3[MACADRR_BYTE_LEN];
|
||||
u16 seq_ctrl; // more endians!
|
||||
u8 addr4[MACADRR_BYTE_LEN];
|
||||
u16 qos_ctrl;
|
||||
} __attribute__ ((packed)) ;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct machdr30
|
||||
{
|
||||
struct machdr30 {
|
||||
u16 frame_ctl;
|
||||
u16 duration; // watch out for endians!
|
||||
u8 addr1[ MACADRR_BYTE_LEN ];
|
||||
u8 addr2[ MACADRR_BYTE_LEN ];
|
||||
u8 addr3[ MACADRR_BYTE_LEN ];
|
||||
u16 seq_ctrl; // more endians!
|
||||
u8 addr4[ MACADRR_BYTE_LEN ];
|
||||
} __attribute__ ((packed)) ;
|
||||
u16 duration; // watch out for endians!
|
||||
u8 addr1[MACADRR_BYTE_LEN];
|
||||
u8 addr2[MACADRR_BYTE_LEN];
|
||||
u8 addr3[MACADRR_BYTE_LEN];
|
||||
u16 seq_ctrl; // more endians!
|
||||
u8 addr4[MACADRR_BYTE_LEN];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct machdr26
|
||||
{
|
||||
struct machdr26 {
|
||||
u16 frame_ctl;
|
||||
u16 duration; // watch out for endians!
|
||||
u8 addr1[ MACADRR_BYTE_LEN ];
|
||||
u8 addr2[ MACADRR_BYTE_LEN ];
|
||||
u8 addr3[ MACADRR_BYTE_LEN ];
|
||||
u16 seq_ctrl; // more endians!
|
||||
u16 duration; // watch out for endians!
|
||||
u8 addr1[MACADRR_BYTE_LEN];
|
||||
u8 addr2[MACADRR_BYTE_LEN];
|
||||
u8 addr3[MACADRR_BYTE_LEN];
|
||||
u16 seq_ctrl; // more endians!
|
||||
u16 qos_ctrl;
|
||||
} __attribute__ ((packed)) ;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct machdr24
|
||||
{
|
||||
struct machdr24 {
|
||||
u16 frame_ctl;
|
||||
u16 duration; // watch out for endians!
|
||||
u8 addr1[ MACADRR_BYTE_LEN ];
|
||||
u8 addr2[ MACADRR_BYTE_LEN ];
|
||||
u8 addr3[ MACADRR_BYTE_LEN ];
|
||||
u16 seq_ctrl; // more endians!
|
||||
} __attribute__ ((packed)) ;
|
||||
u16 duration; // watch out for endians!
|
||||
u8 addr1[MACADRR_BYTE_LEN];
|
||||
u8 addr2[MACADRR_BYTE_LEN];
|
||||
u8 addr3[MACADRR_BYTE_LEN];
|
||||
u16 seq_ctrl; // more endians!
|
||||
} __attribute__ ((packed));
|
||||
|
||||
// TX TFD with 32 byte MAC Header
|
||||
struct tx_tfd_32
|
||||
{
|
||||
struct machdr32 mchdr; // 32
|
||||
u32 uivplaceholder[2]; // 8
|
||||
} __attribute__ ((packed)) ;
|
||||
struct tx_tfd_32 {
|
||||
struct machdr32 mchdr; // 32
|
||||
u32 uivplaceholder[2]; // 8
|
||||
} __attribute__ ((packed));
|
||||
|
||||
// TX TFD with 30 byte MAC Header
|
||||
struct tx_tfd_30
|
||||
{
|
||||
struct machdr30 mchdr; // 30
|
||||
u8 reserved[2]; // 2
|
||||
u32 uivplaceholder[2]; // 8
|
||||
} __attribute__ ((packed)) ;
|
||||
struct tx_tfd_30 {
|
||||
struct machdr30 mchdr; // 30
|
||||
u8 reserved[2]; // 2
|
||||
u32 uivplaceholder[2]; // 8
|
||||
} __attribute__ ((packed));
|
||||
|
||||
// tx tfd with 26 byte mac header
|
||||
struct tx_tfd_26
|
||||
{
|
||||
struct machdr26 mchdr; // 26
|
||||
u8 reserved1[2]; // 2
|
||||
u32 uivplaceholder[2]; // 8
|
||||
u8 reserved2[4]; // 4
|
||||
} __attribute__ ((packed)) ;
|
||||
struct tx_tfd_26 {
|
||||
struct machdr26 mchdr; // 26
|
||||
u8 reserved1[2]; // 2
|
||||
u32 uivplaceholder[2]; // 8
|
||||
u8 reserved2[4]; // 4
|
||||
} __attribute__ ((packed));
|
||||
|
||||
// tx tfd with 24 byte mac header
|
||||
struct tx_tfd_24
|
||||
{
|
||||
struct machdr24 mchdr; // 24
|
||||
u32 uivplaceholder[2]; // 8
|
||||
u8 reserved[8]; // 8
|
||||
} __attribute__ ((packed)) ;
|
||||
|
||||
struct tx_tfd_24 {
|
||||
struct machdr24 mchdr; // 24
|
||||
u32 uivplaceholder[2]; // 8
|
||||
u8 reserved[8]; // 8
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#define DCT_WEP_KEY_FIELD_LENGTH 16
|
||||
|
||||
struct tfd_command
|
||||
{
|
||||
struct tfd_command {
|
||||
u8 index;
|
||||
u8 length;
|
||||
u16 reserved;
|
||||
u8 payload[0];
|
||||
} __attribute__ ((packed)) ;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct tfd_data {
|
||||
/* Header */
|
||||
u32 work_area_ptr;
|
||||
u8 station_number; /* 0 for BSS */
|
||||
u8 station_number; /* 0 for BSS */
|
||||
u8 reserved1;
|
||||
u16 reserved2;
|
||||
|
||||
|
@ -359,14 +346,13 @@ struct tfd_data {
|
|||
u8 antenna;
|
||||
u16 next_packet_duration;
|
||||
u16 next_frag_len;
|
||||
u16 back_off_counter; //////txop;
|
||||
u16 back_off_counter; //////txop;
|
||||
u8 retrylimit;
|
||||
u16 cwcurrent;
|
||||
u8 reserved3;
|
||||
|
||||
/* 802.11 MAC Header */
|
||||
union
|
||||
{
|
||||
union {
|
||||
struct tx_tfd_24 tfd_24;
|
||||
struct tx_tfd_26 tfd_26;
|
||||
struct tx_tfd_30 tfd_30;
|
||||
|
@ -379,8 +365,7 @@ struct tfd_data {
|
|||
u16 chunk_len[NUM_TFD_CHUNKS];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct txrx_control_flags
|
||||
{
|
||||
struct txrx_control_flags {
|
||||
u8 message_type;
|
||||
u8 rx_seq_num;
|
||||
u8 control_bits;
|
||||
|
@ -390,17 +375,16 @@ struct txrx_control_flags
|
|||
#define TFD_SIZE 128
|
||||
#define TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH (TFD_SIZE - sizeof(struct txrx_control_flags))
|
||||
|
||||
struct tfd_frame
|
||||
{
|
||||
struct tfd_frame {
|
||||
struct txrx_control_flags control_flags;
|
||||
union {
|
||||
struct tfd_data data;
|
||||
struct tfd_command cmd;
|
||||
u8 raw[TFD_CMD_IMMEDIATE_PAYLOAD_LENGTH];
|
||||
} u;
|
||||
} __attribute__ ((packed)) ;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
typedef void destructor_func(const void*);
|
||||
typedef void destructor_func(const void *);
|
||||
|
||||
/**
|
||||
* Tx Queue for DMA. Queue consists of circular buffer of
|
||||
|
@ -408,7 +392,7 @@ typedef void destructor_func(const void*);
|
|||
*/
|
||||
struct clx2_tx_queue {
|
||||
struct clx2_queue q;
|
||||
struct tfd_frame* bd;
|
||||
struct tfd_frame *bd;
|
||||
struct ieee80211_txb **txb;
|
||||
};
|
||||
|
||||
|
@ -423,8 +407,7 @@ struct clx2_tx_queue {
|
|||
#define SUP_RATE_11G_MAX_NUM_CHANNELS (12)
|
||||
|
||||
// Used for passing to driver number of successes and failures per rate
|
||||
struct rate_histogram
|
||||
{
|
||||
struct rate_histogram {
|
||||
union {
|
||||
u32 a[SUP_RATE_11A_MAX_NUM_CHANNELS];
|
||||
u32 b[SUP_RATE_11B_MAX_NUM_CHANNELS];
|
||||
|
@ -475,12 +458,12 @@ struct notif_scan_complete {
|
|||
u8 num_channels;
|
||||
u8 status;
|
||||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct notif_frag_length {
|
||||
u16 frag_length;
|
||||
u16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct notif_beacon_state {
|
||||
u32 state;
|
||||
|
@ -543,11 +526,11 @@ struct ipw_rx_notification {
|
|||
|
||||
struct ipw_rx_frame {
|
||||
u32 reserved1;
|
||||
u8 parent_tsf[4]; // fw_use[0] is boolean for OUR_TSF_IS_GREATER
|
||||
u8 received_channel; // The channel that this frame was received on.
|
||||
// Note that for .11b this does not have to be
|
||||
// the same as the channel that it was sent.
|
||||
// Filled by LMAC
|
||||
u8 parent_tsf[4]; // fw_use[0] is boolean for OUR_TSF_IS_GREATER
|
||||
u8 received_channel; // The channel that this frame was received on.
|
||||
// Note that for .11b this does not have to be
|
||||
// the same as the channel that it was sent.
|
||||
// Filled by LMAC
|
||||
u8 frameStatus;
|
||||
u8 rate;
|
||||
u8 rssi;
|
||||
|
@ -556,10 +539,10 @@ struct ipw_rx_frame {
|
|||
u16 signal;
|
||||
u16 noise;
|
||||
u8 antennaAndPhy;
|
||||
u8 control; // control bit should be on in bg
|
||||
u8 rtscts_rate; // rate of rts or cts (in rts cts sequence rate
|
||||
// is identical)
|
||||
u8 rtscts_seen; // 0x1 RTS seen ; 0x2 CTS seen
|
||||
u8 control; // control bit should be on in bg
|
||||
u8 rtscts_rate; // rate of rts or cts (in rts cts sequence rate
|
||||
// is identical)
|
||||
u8 rtscts_seen; // 0x1 RTS seen ; 0x2 CTS seen
|
||||
u16 length;
|
||||
u8 data[0];
|
||||
} __attribute__ ((packed));
|
||||
|
@ -571,8 +554,7 @@ struct ipw_rx_header {
|
|||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_rx_packet
|
||||
{
|
||||
struct ipw_rx_packet {
|
||||
struct ipw_rx_header header;
|
||||
union {
|
||||
struct ipw_rx_frame frame;
|
||||
|
@ -589,21 +571,20 @@ struct ipw_rx_mem_buffer {
|
|||
struct ipw_rx_buffer *rxb;
|
||||
struct sk_buff *skb;
|
||||
struct list_head list;
|
||||
}; /* Not transferred over network, so not __attribute__ ((packed)) */
|
||||
}; /* Not transferred over network, so not __attribute__ ((packed)) */
|
||||
|
||||
struct ipw_rx_queue {
|
||||
struct ipw_rx_mem_buffer pool[RX_QUEUE_SIZE + RX_FREE_BUFFERS];
|
||||
struct ipw_rx_mem_buffer *queue[RX_QUEUE_SIZE];
|
||||
u32 processed; /* Internal index to last handled Rx packet */
|
||||
u32 read; /* Shared index to newest available Rx buffer */
|
||||
u32 write; /* Shared index to oldest written Rx packet */
|
||||
u32 free_count;/* Number of pre-allocated buffers in rx_free */
|
||||
u32 processed; /* Internal index to last handled Rx packet */
|
||||
u32 read; /* Shared index to newest available Rx buffer */
|
||||
u32 write; /* Shared index to oldest written Rx packet */
|
||||
u32 free_count; /* Number of pre-allocated buffers in rx_free */
|
||||
/* Each of these lists is used as a FIFO for ipw_rx_mem_buffers */
|
||||
struct list_head rx_free; /* Own an SKBs */
|
||||
struct list_head rx_used; /* No SKB allocated */
|
||||
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 __attribute__ ((packed)) */
|
||||
|
||||
struct alive_command_responce {
|
||||
u8 alive_command;
|
||||
|
@ -627,8 +608,7 @@ struct ipw_rates {
|
|||
u8 rates[IPW_MAX_RATES];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct command_block
|
||||
{
|
||||
struct command_block {
|
||||
unsigned int control;
|
||||
u32 source_addr;
|
||||
u32 dest_addr;
|
||||
|
@ -636,18 +616,16 @@ struct command_block
|
|||
} __attribute__ ((packed));
|
||||
|
||||
#define CB_NUMBER_OF_ELEMENTS_SMALL 64
|
||||
struct fw_image_desc
|
||||
{
|
||||
struct fw_image_desc {
|
||||
unsigned long last_cb_index;
|
||||
unsigned long current_cb_index;
|
||||
struct command_block cb_list[CB_NUMBER_OF_ELEMENTS_SMALL];
|
||||
void * v_addr;
|
||||
void *v_addr;
|
||||
unsigned long p_addr;
|
||||
unsigned long len;
|
||||
};
|
||||
|
||||
struct ipw_sys_config
|
||||
{
|
||||
struct ipw_sys_config {
|
||||
u8 bt_coexistence;
|
||||
u8 reserved1;
|
||||
u8 answer_broadcast_ssid_probe;
|
||||
|
@ -670,8 +648,7 @@ struct ipw_sys_config
|
|||
u8 reserved3;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_multicast_addr
|
||||
{
|
||||
struct ipw_multicast_addr {
|
||||
u8 num_of_multicast_addresses;
|
||||
u8 reserved[3];
|
||||
u8 mac1[6];
|
||||
|
@ -680,8 +657,7 @@ struct ipw_multicast_addr
|
|||
u8 mac4[6];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_wep_key
|
||||
{
|
||||
struct ipw_wep_key {
|
||||
u8 cmd_id;
|
||||
u8 seq_num;
|
||||
u8 key_index;
|
||||
|
@ -689,8 +665,7 @@ struct ipw_wep_key
|
|||
u8 key[16];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_tgi_tx_key
|
||||
{
|
||||
struct ipw_tgi_tx_key {
|
||||
u8 key_id;
|
||||
u8 security_type;
|
||||
u8 station_index;
|
||||
|
@ -701,8 +676,7 @@ struct ipw_tgi_tx_key
|
|||
|
||||
#define IPW_SCAN_CHANNELS 54
|
||||
|
||||
struct ipw_scan_request
|
||||
{
|
||||
struct ipw_scan_request {
|
||||
u8 scan_type;
|
||||
u16 dwell_time;
|
||||
u8 channels_list[IPW_SCAN_CHANNELS];
|
||||
|
@ -718,8 +692,7 @@ enum {
|
|||
IPW_SCAN_TYPES
|
||||
};
|
||||
|
||||
struct ipw_scan_request_ext
|
||||
{
|
||||
struct ipw_scan_request_ext {
|
||||
u32 full_scan_index;
|
||||
u8 channels_list[IPW_SCAN_CHANNELS];
|
||||
u8 scan_type[IPW_SCAN_CHANNELS / 2];
|
||||
|
@ -740,19 +713,16 @@ extern inline void ipw_set_scan_type(struct ipw_scan_request_ext *scan,
|
|||
{
|
||||
if (index % 2)
|
||||
scan->scan_type[index / 2] =
|
||||
(scan->scan_type[index / 2] & 0xF0) |
|
||||
(scan_type & 0x0F);
|
||||
(scan->scan_type[index / 2] & 0xF0) | (scan_type & 0x0F);
|
||||
else
|
||||
scan->scan_type[index / 2] =
|
||||
(scan->scan_type[index / 2] & 0x0F) |
|
||||
((scan_type & 0x0F) << 4);
|
||||
(scan->scan_type[index / 2] & 0x0F) |
|
||||
((scan_type & 0x0F) << 4);
|
||||
}
|
||||
|
||||
struct ipw_associate
|
||||
{
|
||||
struct ipw_associate {
|
||||
u8 channel;
|
||||
u8 auth_type:4,
|
||||
auth_key:4;
|
||||
u8 auth_type:4, auth_key:4;
|
||||
u8 assoc_type;
|
||||
u8 reserved;
|
||||
u16 policy_support;
|
||||
|
@ -771,8 +741,7 @@ struct ipw_associate
|
|||
u16 reserved2;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_supported_rates
|
||||
{
|
||||
struct ipw_supported_rates {
|
||||
u8 ieee_mode;
|
||||
u8 num_rates;
|
||||
u8 purpose;
|
||||
|
@ -780,42 +749,36 @@ struct ipw_supported_rates
|
|||
u8 supported_rates[IPW_MAX_RATES];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_rts_threshold
|
||||
{
|
||||
struct ipw_rts_threshold {
|
||||
u16 rts_threshold;
|
||||
u16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_frag_threshold
|
||||
{
|
||||
struct ipw_frag_threshold {
|
||||
u16 frag_threshold;
|
||||
u16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_retry_limit
|
||||
{
|
||||
struct ipw_retry_limit {
|
||||
u8 short_retry_limit;
|
||||
u8 long_retry_limit;
|
||||
u16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_dino_config
|
||||
{
|
||||
struct ipw_dino_config {
|
||||
u32 dino_config_addr;
|
||||
u16 dino_config_size;
|
||||
u8 dino_response;
|
||||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_aironet_info
|
||||
{
|
||||
struct ipw_aironet_info {
|
||||
u8 id;
|
||||
u8 length;
|
||||
u16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_rx_key
|
||||
{
|
||||
struct ipw_rx_key {
|
||||
u8 station_index;
|
||||
u8 key_type;
|
||||
u8 key_id;
|
||||
|
@ -826,23 +789,20 @@ struct ipw_rx_key
|
|||
u8 reserved;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_country_channel_info
|
||||
{
|
||||
struct ipw_country_channel_info {
|
||||
u8 first_channel;
|
||||
u8 no_channels;
|
||||
s8 max_tx_power;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_country_info
|
||||
{
|
||||
struct ipw_country_info {
|
||||
u8 id;
|
||||
u8 length;
|
||||
u8 country_str[3];
|
||||
struct ipw_country_channel_info groups[7];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_channel_tx_power
|
||||
{
|
||||
struct ipw_channel_tx_power {
|
||||
u8 channel_number;
|
||||
s8 tx_power;
|
||||
} __attribute__ ((packed));
|
||||
|
@ -852,15 +812,13 @@ struct ipw_channel_tx_power
|
|||
#define MAX_A_CHANNELS 37
|
||||
#define MAX_B_CHANNELS 14
|
||||
|
||||
struct ipw_tx_power
|
||||
{
|
||||
struct ipw_tx_power {
|
||||
u8 num_channels;
|
||||
u8 ieee_mode;
|
||||
struct ipw_channel_tx_power channels_tx_power[MAX_A_CHANNELS];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_qos_parameters
|
||||
{
|
||||
struct ipw_qos_parameters {
|
||||
u16 cw_min[4];
|
||||
u16 cw_max[4];
|
||||
u8 aifs[4];
|
||||
|
@ -868,15 +826,13 @@ struct ipw_qos_parameters
|
|||
u16 tx_op_limit[4];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_rsn_capabilities
|
||||
{
|
||||
struct ipw_rsn_capabilities {
|
||||
u8 id;
|
||||
u8 length;
|
||||
u16 version;
|
||||
} __attribute__ ((packed));
|
||||
|
||||
struct ipw_sensitivity_calib
|
||||
{
|
||||
struct ipw_sensitivity_calib {
|
||||
u16 beacon_rssi_raw;
|
||||
u16 reserved;
|
||||
} __attribute__ ((packed));
|
||||
|
@ -895,10 +851,11 @@ struct ipw_sensitivity_calib
|
|||
* - \a param filled with status parameters.
|
||||
*/
|
||||
struct ipw_cmd {
|
||||
u32 cmd; /**< Host command */
|
||||
u32 status; /**< Status */
|
||||
u32 status_len; /**< How many 32 bit parameters in the status */
|
||||
u32 len; /**< incoming parameters length, bytes */
|
||||
u32 cmd; /**< Host command */
|
||||
u32 status;/**< Status */
|
||||
u32 status_len;
|
||||
/**< How many 32 bit parameters in the status */
|
||||
u32 len; /**< incoming parameters length, bytes */
|
||||
/**
|
||||
* command parameters.
|
||||
* There should be enough space for incoming and
|
||||
|
@ -906,10 +863,10 @@ struct ipw_cmd {
|
|||
* Incoming parameters listed 1-st, followed by outcoming params.
|
||||
* nParams=(len+3)/4+status_len
|
||||
*/
|
||||
u32 param[0];
|
||||
u32 param[0];
|
||||
} __attribute__ ((packed));
|
||||
|
||||
#define STATUS_HCMD_ACTIVE (1<<0) /**< host command in progress */
|
||||
#define STATUS_HCMD_ACTIVE (1<<0) /**< host command in progress */
|
||||
|
||||
#define STATUS_INT_ENABLED (1<<1)
|
||||
#define STATUS_RF_KILL_HW (1<<2)
|
||||
|
@ -932,15 +889,15 @@ struct ipw_cmd {
|
|||
#define STATUS_SCANNING (1<<21)
|
||||
#define STATUS_SCAN_ABORTING (1<<22)
|
||||
|
||||
#define STATUS_INDIRECT_BYTE (1<<28) /* sysfs entry configured for access */
|
||||
#define STATUS_INDIRECT_DWORD (1<<29) /* sysfs entry configured for access */
|
||||
#define STATUS_DIRECT_DWORD (1<<30) /* sysfs entry configured for access */
|
||||
#define STATUS_INDIRECT_BYTE (1<<28) /* sysfs entry configured for access */
|
||||
#define STATUS_INDIRECT_DWORD (1<<29) /* sysfs entry configured for access */
|
||||
#define STATUS_DIRECT_DWORD (1<<30) /* sysfs entry configured for access */
|
||||
|
||||
#define STATUS_SECURITY_UPDATED (1<<31) /* Security sync needed */
|
||||
#define STATUS_SECURITY_UPDATED (1<<31) /* Security sync needed */
|
||||
|
||||
#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_BSSID (1<<2) /* Restrict assoc. to single BSSID */
|
||||
#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_BSSID (1<<2) /* Restrict assoc. to single BSSID */
|
||||
#define CFG_CUSTOM_MAC (1<<3)
|
||||
#define CFG_PREAMBLE (1<<4)
|
||||
#define CFG_ADHOC_PERSIST (1<<5)
|
||||
|
@ -948,8 +905,8 @@ struct ipw_cmd {
|
|||
#define CFG_FIXED_RATE (1<<7)
|
||||
#define CFG_ADHOC_CREATE (1<<8)
|
||||
|
||||
#define CAP_SHARED_KEY (1<<0) /* Off = OPEN */
|
||||
#define CAP_PRIVACY_ON (1<<1) /* Off = No privacy */
|
||||
#define CAP_SHARED_KEY (1<<0) /* Off = OPEN */
|
||||
#define CAP_PRIVACY_ON (1<<1) /* Off = No privacy */
|
||||
|
||||
#define MAX_STATIONS 32
|
||||
#define IPW_INVALID_STATION (0xff)
|
||||
|
@ -989,8 +946,8 @@ struct ipw_priv {
|
|||
/* result of ucode download */
|
||||
struct alive_command_responce dino_alive;
|
||||
|
||||
wait_queue_head_t wait_command_queue;
|
||||
wait_queue_head_t wait_state;
|
||||
wait_queue_head_t wait_command_queue;
|
||||
wait_queue_head_t wait_state;
|
||||
|
||||
/* Rx and Tx DMA processing queues */
|
||||
struct ipw_rx_queue *rxq;
|
||||
|
@ -1006,9 +963,9 @@ struct ipw_priv {
|
|||
struct average average_rssi;
|
||||
struct average average_noise;
|
||||
u32 port_type;
|
||||
int rx_bufs_min; /**< minimum number of bufs in Rx queue */
|
||||
int rx_pend_max; /**< maximum pending buffers for one IRQ */
|
||||
u32 hcmd_seq; /**< sequence number for hcmd */
|
||||
int rx_bufs_min; /**< minimum number of bufs in Rx queue */
|
||||
int rx_pend_max; /**< maximum pending buffers for one IRQ */
|
||||
u32 hcmd_seq; /**< sequence number for hcmd */
|
||||
u32 missed_beacon_threshold;
|
||||
u32 roaming_threshold;
|
||||
|
||||
|
@ -1017,17 +974,17 @@ struct ipw_priv {
|
|||
|
||||
unsigned long ts_scan_abort;
|
||||
struct ipw_supported_rates rates;
|
||||
struct ipw_rates phy[3]; /**< PHY restrictions, per band */
|
||||
struct ipw_rates supp; /**< software defined */
|
||||
struct ipw_rates extended; /**< use for corresp. IE, AP only */
|
||||
struct ipw_rates phy[3]; /**< PHY restrictions, per band */
|
||||
struct ipw_rates supp; /**< software defined */
|
||||
struct ipw_rates extended; /**< use for corresp. IE, AP only */
|
||||
|
||||
struct notif_link_deterioration last_link_deterioration; /** for statistics */
|
||||
struct ipw_cmd* hcmd; /**< host command currently executed */
|
||||
struct ipw_cmd *hcmd; /**< host command currently executed */
|
||||
|
||||
wait_queue_head_t hcmd_wq; /**< host command waits for execution */
|
||||
u32 tsf_bcn[2]; /**< TSF from latest beacon */
|
||||
u32 tsf_bcn[2]; /**< TSF from latest beacon */
|
||||
|
||||
struct notif_calibration calib; /**< last calibration */
|
||||
struct notif_calibration calib; /**< last calibration */
|
||||
|
||||
/* ordinal interface with firmware */
|
||||
u32 table0_addr;
|
||||
|
@ -1067,8 +1024,8 @@ struct ipw_priv {
|
|||
u32 tx_packets;
|
||||
u32 quality;
|
||||
|
||||
/* eeprom */
|
||||
u8 eeprom[0x100]; /* 256 bytes of eeprom */
|
||||
/* eeprom */
|
||||
u8 eeprom[0x100]; /* 256 bytes of eeprom */
|
||||
int eeprom_delay;
|
||||
|
||||
struct iw_statistics wstats;
|
||||
|
@ -1091,7 +1048,6 @@ struct ipw_priv {
|
|||
|
||||
struct tasklet_struct irq_tasklet;
|
||||
|
||||
|
||||
#define IPW_2200BG 1
|
||||
#define IPW_2915ABG 2
|
||||
u8 adapter;
|
||||
|
@ -1114,7 +1070,6 @@ struct ipw_priv {
|
|||
u32 indirect_byte;
|
||||
}; /*ipw_priv */
|
||||
|
||||
|
||||
/* debug macros */
|
||||
|
||||
#ifdef CONFIG_IPW_DEBUG
|
||||
|
@ -1170,7 +1125,6 @@ do { if (ipw_debug_level & (level)) \
|
|||
#define IPW_DL_RF_KILL (1<<17)
|
||||
#define IPW_DL_FW_ERRORS (1<<18)
|
||||
|
||||
|
||||
#define IPW_DL_ORD (1<<20)
|
||||
|
||||
#define IPW_DL_FRAG (1<<21)
|
||||
|
@ -1184,7 +1138,6 @@ do { if (ipw_debug_level & (level)) \
|
|||
|
||||
#define IPW_DL_STATS (1<<29)
|
||||
|
||||
|
||||
#define IPW_ERROR(f, a...) printk(KERN_ERR DRV_NAME ": " f, ## a)
|
||||
#define IPW_WARNING(f, a...) printk(KERN_WARNING DRV_NAME ": " f, ## a)
|
||||
#define IPW_DEBUG_INFO(f, a...) IPW_DEBUG(IPW_DL_INFO, f, ## a)
|
||||
|
@ -1253,12 +1206,12 @@ do { if (ipw_debug_level & (level)) \
|
|||
/*
|
||||
* RESET Register Bit Indexes
|
||||
*/
|
||||
#define CBD_RESET_REG_PRINCETON_RESET 0x00000001 /* Bit 0 (LSB) */
|
||||
#define CX2_RESET_REG_SW_RESET 0x00000080 /* Bit 7 */
|
||||
#define CX2_RESET_REG_MASTER_DISABLED 0x00000100 /* Bit 8 */
|
||||
#define CX2_RESET_REG_STOP_MASTER 0x00000200 /* Bit 9 */
|
||||
#define CX2_ARC_KESHET_CONFIG 0x08000000 /* Bit 27 */
|
||||
#define CX2_START_STANDBY 0x00000004 /* Bit 2 */
|
||||
#define CBD_RESET_REG_PRINCETON_RESET 0x00000001 /* Bit 0 (LSB) */
|
||||
#define CX2_RESET_REG_SW_RESET 0x00000080 /* Bit 7 */
|
||||
#define CX2_RESET_REG_MASTER_DISABLED 0x00000100 /* Bit 8 */
|
||||
#define CX2_RESET_REG_STOP_MASTER 0x00000200 /* Bit 9 */
|
||||
#define CX2_ARC_KESHET_CONFIG 0x08000000 /* Bit 27 */
|
||||
#define CX2_START_STANDBY 0x00000004 /* Bit 2 */
|
||||
|
||||
#define CX2_CSR_CIS_UPPER_BOUND 0x00000200
|
||||
#define CX2_DOMAIN_0_END 0x1000
|
||||
|
@ -1289,14 +1242,12 @@ do { if (ipw_debug_level & (level)) \
|
|||
#define CB_SRC_SIZE_LONG 0x00200000
|
||||
#define CB_DEST_SIZE_LONG 0x00020000
|
||||
|
||||
|
||||
/* DMA DEFINES */
|
||||
|
||||
#define DMA_CONTROL_SMALL_CB_CONST_VALUE 0x00540000
|
||||
#define DMA_CB_STOP_AND_ABORT 0x00000C00
|
||||
#define DMA_CB_START 0x00000100
|
||||
|
||||
|
||||
#define CX2_SHARED_SRAM_SIZE 0x00030000
|
||||
#define CX2_SHARED_SRAM_DMA_CONTROL 0x00027000
|
||||
#define CB_MAX_LENGTH 0x1FFF
|
||||
|
@ -1304,7 +1255,6 @@ do { if (ipw_debug_level & (level)) \
|
|||
#define CX2_HOST_EEPROM_DATA_SRAM_SIZE 0xA18
|
||||
#define CX2_EEPROM_IMAGE_SIZE 0x100
|
||||
|
||||
|
||||
/* DMA defs */
|
||||
#define CX2_DMA_I_CURRENT_CB 0x003000D0
|
||||
#define CX2_DMA_O_CURRENT_CB 0x003000D4
|
||||
|
@ -1356,7 +1306,6 @@ do { if (ipw_debug_level & (level)) \
|
|||
#define IPW_WHO_IS_AWAKE (CX2_SHARED_LOWER_BOUND + 0xB14)
|
||||
#define IPW_DURING_ATIM_WINDOW (CX2_SHARED_LOWER_BOUND + 0xB18)
|
||||
|
||||
|
||||
#define MSB 1
|
||||
#define LSB 0
|
||||
#define WORD_TO_BYTE(_word) ((_word) * sizeof(u16))
|
||||
|
@ -1365,16 +1314,16 @@ do { if (ipw_debug_level & (level)) \
|
|||
( WORD_TO_BYTE(_wordoffset) + (_byteoffset) )
|
||||
|
||||
/* EEPROM access by BYTE */
|
||||
#define EEPROM_PME_CAPABILITY (GET_EEPROM_ADDR(0x09,MSB)) /* 1 byte */
|
||||
#define EEPROM_MAC_ADDRESS (GET_EEPROM_ADDR(0x21,LSB)) /* 6 byte */
|
||||
#define EEPROM_VERSION (GET_EEPROM_ADDR(0x24,MSB)) /* 1 byte */
|
||||
#define EEPROM_NIC_TYPE (GET_EEPROM_ADDR(0x25,LSB)) /* 1 byte */
|
||||
#define EEPROM_SKU_CAPABILITY (GET_EEPROM_ADDR(0x25,MSB)) /* 1 byte */
|
||||
#define EEPROM_COUNTRY_CODE (GET_EEPROM_ADDR(0x26,LSB)) /* 3 bytes */
|
||||
#define EEPROM_IBSS_CHANNELS_BG (GET_EEPROM_ADDR(0x28,LSB)) /* 2 bytes */
|
||||
#define EEPROM_IBSS_CHANNELS_A (GET_EEPROM_ADDR(0x29,MSB)) /* 5 bytes */
|
||||
#define EEPROM_BSS_CHANNELS_BG (GET_EEPROM_ADDR(0x2c,LSB)) /* 2 bytes */
|
||||
#define EEPROM_HW_VERSION (GET_EEPROM_ADDR(0x72,LSB)) /* 2 bytes */
|
||||
#define EEPROM_PME_CAPABILITY (GET_EEPROM_ADDR(0x09,MSB)) /* 1 byte */
|
||||
#define EEPROM_MAC_ADDRESS (GET_EEPROM_ADDR(0x21,LSB)) /* 6 byte */
|
||||
#define EEPROM_VERSION (GET_EEPROM_ADDR(0x24,MSB)) /* 1 byte */
|
||||
#define EEPROM_NIC_TYPE (GET_EEPROM_ADDR(0x25,LSB)) /* 1 byte */
|
||||
#define EEPROM_SKU_CAPABILITY (GET_EEPROM_ADDR(0x25,MSB)) /* 1 byte */
|
||||
#define EEPROM_COUNTRY_CODE (GET_EEPROM_ADDR(0x26,LSB)) /* 3 bytes */
|
||||
#define EEPROM_IBSS_CHANNELS_BG (GET_EEPROM_ADDR(0x28,LSB)) /* 2 bytes */
|
||||
#define EEPROM_IBSS_CHANNELS_A (GET_EEPROM_ADDR(0x29,MSB)) /* 5 bytes */
|
||||
#define EEPROM_BSS_CHANNELS_BG (GET_EEPROM_ADDR(0x2c,LSB)) /* 2 bytes */
|
||||
#define EEPROM_HW_VERSION (GET_EEPROM_ADDR(0x72,LSB)) /* 2 bytes */
|
||||
|
||||
/* NIC type as found in the one byte EEPROM_NIC_TYPE offset*/
|
||||
#define EEPROM_NIC_TYPE_STANDARD 0
|
||||
|
@ -1479,7 +1428,6 @@ enum {
|
|||
#define IPW_RATE_CAPABILITIES 1
|
||||
#define IPW_RATE_CONNECT 0
|
||||
|
||||
|
||||
/*
|
||||
* Rate values and masks
|
||||
*/
|
||||
|
@ -1524,12 +1472,6 @@ enum {
|
|||
IPW_ORD_STAT_TX_DIR_DATA_B_11,
|
||||
/* Hole */
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
IPW_ORD_STAT_TX_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 19,
|
||||
IPW_ORD_STAT_TX_DIR_DATA_G_2,
|
||||
IPW_ORD_STAT_TX_DIR_DATA_G_5_5,
|
||||
|
@ -1549,12 +1491,6 @@ enum {
|
|||
IPW_ORD_STAT_TX_NON_DIR_DATA_B_11,
|
||||
/* Hole */
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
IPW_ORD_STAT_TX_NON_DIR_DATA_G_1 = IPW_ORD_TABLE_0_MASK + 44,
|
||||
IPW_ORD_STAT_TX_NON_DIR_DATA_G_2,
|
||||
IPW_ORD_STAT_TX_NON_DIR_DATA_G_5_5,
|
||||
|
@ -1685,7 +1621,7 @@ struct host_cmd {
|
|||
#define CFG_BT_COEXISTENCE_WME_OVER_BT 0x08
|
||||
#define CFG_BT_COEXISTENCE_OOB 0x10
|
||||
#define CFG_BT_COEXISTENCE_MAX 0xFF
|
||||
#define CFG_BT_COEXISTENCE_DEF 0x80 /* read Bt from EEPROM*/
|
||||
#define CFG_BT_COEXISTENCE_DEF 0x80 /* read Bt from EEPROM */
|
||||
|
||||
#define CFG_CTS_TO_ITSELF_ENABLED_MIN 0x0
|
||||
#define CFG_CTS_TO_ITSELF_ENABLED_MAX 0x1
|
||||
|
@ -1727,11 +1663,11 @@ static inline u32 frame_hdr_len(struct ieee80211_hdr *hdr)
|
|||
fc = le16_to_cpu(hdr->frame_ctl);
|
||||
|
||||
/*
|
||||
* Function ToDS FromDS
|
||||
* IBSS 0 0
|
||||
* To AP 1 0
|
||||
* From AP 0 1
|
||||
* WDS (bridge) 1 1
|
||||
* Function ToDS FromDS
|
||||
* IBSS 0 0
|
||||
* To AP 1 0
|
||||
* From AP 0 1
|
||||
* WDS (bridge) 1 1
|
||||
*
|
||||
* Only WDS frames use Address4 among them. --YZ
|
||||
*/
|
||||
|
@ -1741,4 +1677,4 @@ static inline u32 frame_hdr_len(struct ieee80211_hdr *hdr)
|
|||
return retval;
|
||||
}
|
||||
|
||||
#endif /* __ipw2200_h__ */
|
||||
#endif /* __ipw2200_h__ */
|
||||
|
|
|
@ -30,7 +30,6 @@ struct ieee80211_crypto_alg {
|
|||
struct ieee80211_crypto_ops *ops;
|
||||
};
|
||||
|
||||
|
||||
struct ieee80211_crypto {
|
||||
struct list_head algs;
|
||||
spinlock_t lock;
|
||||
|
@ -38,8 +37,7 @@ struct ieee80211_crypto {
|
|||
|
||||
static struct ieee80211_crypto *hcrypt;
|
||||
|
||||
void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee,
|
||||
int force)
|
||||
void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, int force)
|
||||
{
|
||||
struct list_head *ptr, *n;
|
||||
struct ieee80211_crypt_data *entry;
|
||||
|
@ -140,7 +138,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
|
|||
spin_lock_irqsave(&hcrypt->lock, flags);
|
||||
for (ptr = hcrypt->algs.next; ptr != &hcrypt->algs; ptr = ptr->next) {
|
||||
struct ieee80211_crypto_alg *alg =
|
||||
(struct ieee80211_crypto_alg *) ptr;
|
||||
(struct ieee80211_crypto_alg *)ptr;
|
||||
if (alg->ops == ops) {
|
||||
list_del(&alg->list);
|
||||
del_alg = alg;
|
||||
|
@ -158,8 +156,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
|
|||
return del_alg ? 0 : -1;
|
||||
}
|
||||
|
||||
|
||||
struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
|
||||
struct ieee80211_crypto_ops *ieee80211_get_crypto_ops(const char *name)
|
||||
{
|
||||
unsigned long flags;
|
||||
struct list_head *ptr;
|
||||
|
@ -171,7 +168,7 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
|
|||
spin_lock_irqsave(&hcrypt->lock, flags);
|
||||
for (ptr = hcrypt->algs.next; ptr != &hcrypt->algs; ptr = ptr->next) {
|
||||
struct ieee80211_crypto_alg *alg =
|
||||
(struct ieee80211_crypto_alg *) ptr;
|
||||
(struct ieee80211_crypto_alg *)ptr;
|
||||
if (strcmp(alg->ops->name, name) == 0) {
|
||||
found_alg = alg;
|
||||
break;
|
||||
|
@ -185,9 +182,13 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static void * ieee80211_crypt_null_init(int keyidx) { return (void *) 1; }
|
||||
static void ieee80211_crypt_null_deinit(void *priv) {}
|
||||
static void *ieee80211_crypt_null_init(int keyidx)
|
||||
{
|
||||
return (void *)1;
|
||||
}
|
||||
static void ieee80211_crypt_null_deinit(void *priv)
|
||||
{
|
||||
}
|
||||
|
||||
static struct ieee80211_crypto_ops ieee80211_crypt_null = {
|
||||
.name = "NULL",
|
||||
|
@ -204,7 +205,6 @@ static struct ieee80211_crypto_ops ieee80211_crypt_null = {
|
|||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
|
||||
static int __init ieee80211_crypto_init(void)
|
||||
{
|
||||
int ret = -ENOMEM;
|
||||
|
@ -222,11 +222,10 @@ static int __init ieee80211_crypto_init(void)
|
|||
kfree(hcrypt);
|
||||
hcrypt = NULL;
|
||||
}
|
||||
out:
|
||||
out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
static void __exit ieee80211_crypto_deinit(void)
|
||||
{
|
||||
struct list_head *ptr, *n;
|
||||
|
@ -237,7 +236,7 @@ static void __exit ieee80211_crypto_deinit(void)
|
|||
for (ptr = hcrypt->algs.next, n = ptr->next; ptr != &hcrypt->algs;
|
||||
ptr = n, n = ptr->next) {
|
||||
struct ieee80211_crypto_alg *alg =
|
||||
(struct ieee80211_crypto_alg *) ptr;
|
||||
(struct ieee80211_crypto_alg *)ptr;
|
||||
list_del(ptr);
|
||||
printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
|
||||
"'%s' (deinit)\n", alg->ops->name);
|
||||
|
|
|
@ -24,7 +24,6 @@
|
|||
|
||||
#include <net/ieee80211.h>
|
||||
|
||||
|
||||
#include <linux/crypto.h>
|
||||
#include <asm/scatterlist.h>
|
||||
|
||||
|
@ -55,7 +54,7 @@ struct ieee80211_ccmp_data {
|
|||
|
||||
/* scratch buffers for virt_to_page() (crypto API) */
|
||||
u8 tx_b0[AES_BLOCK_LEN], tx_b[AES_BLOCK_LEN],
|
||||
tx_e[AES_BLOCK_LEN], tx_s0[AES_BLOCK_LEN];
|
||||
tx_e[AES_BLOCK_LEN], tx_s0[AES_BLOCK_LEN];
|
||||
u8 rx_b0[AES_BLOCK_LEN], rx_b[AES_BLOCK_LEN], rx_a[AES_BLOCK_LEN];
|
||||
};
|
||||
|
||||
|
@ -75,7 +74,7 @@ static void ieee80211_ccmp_aes_encrypt(struct crypto_tfm *tfm,
|
|||
crypto_cipher_encrypt(tfm, &dst, &src, AES_BLOCK_LEN);
|
||||
}
|
||||
|
||||
static void * ieee80211_ccmp_init(int key_idx)
|
||||
static void *ieee80211_ccmp_init(int key_idx)
|
||||
{
|
||||
struct ieee80211_ccmp_data *priv;
|
||||
|
||||
|
@ -94,7 +93,7 @@ static void * ieee80211_ccmp_init(int key_idx)
|
|||
|
||||
return priv;
|
||||
|
||||
fail:
|
||||
fail:
|
||||
if (priv) {
|
||||
if (priv->tfm)
|
||||
crypto_free_tfm(priv->tfm);
|
||||
|
@ -104,7 +103,6 @@ fail:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static void ieee80211_ccmp_deinit(void *priv)
|
||||
{
|
||||
struct ieee80211_ccmp_data *_priv = priv;
|
||||
|
@ -113,19 +111,16 @@ static void ieee80211_ccmp_deinit(void *priv)
|
|||
kfree(priv);
|
||||
}
|
||||
|
||||
|
||||
static inline void xor_block(u8 *b, u8 *a, size_t len)
|
||||
static inline void xor_block(u8 * b, u8 * a, size_t len)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < len; i++)
|
||||
b[i] ^= a[i];
|
||||
}
|
||||
|
||||
|
||||
static void ccmp_init_blocks(struct crypto_tfm *tfm,
|
||||
struct ieee80211_hdr *hdr,
|
||||
u8 *pn, size_t dlen, u8 *b0, u8 *auth,
|
||||
u8 *s0)
|
||||
u8 * pn, size_t dlen, u8 * b0, u8 * auth, u8 * s0)
|
||||
{
|
||||
u8 *pos, qc = 0;
|
||||
size_t aad_len;
|
||||
|
@ -142,7 +137,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
|
|||
if (a4_included)
|
||||
aad_len += 6;
|
||||
if (qc_included) {
|
||||
pos = (u8 *) &hdr->addr4;
|
||||
pos = (u8 *) & hdr->addr4;
|
||||
if (a4_included)
|
||||
pos += 6;
|
||||
qc = *pos & 0x0f;
|
||||
|
@ -169,14 +164,14 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
|
|||
* QC (if present)
|
||||
*/
|
||||
pos = (u8 *) hdr;
|
||||
aad[0] = 0; /* aad_len >> 8 */
|
||||
aad[0] = 0; /* aad_len >> 8 */
|
||||
aad[1] = aad_len & 0xff;
|
||||
aad[2] = pos[0] & 0x8f;
|
||||
aad[3] = pos[1] & 0xc7;
|
||||
memcpy(aad + 4, hdr->addr1, 3 * ETH_ALEN);
|
||||
pos = (u8 *) &hdr->seq_ctl;
|
||||
pos = (u8 *) & hdr->seq_ctl;
|
||||
aad[22] = pos[0] & 0x0f;
|
||||
aad[23] = 0; /* all bits masked */
|
||||
aad[23] = 0; /* all bits masked */
|
||||
memset(aad + 24, 0, 8);
|
||||
if (a4_included)
|
||||
memcpy(aad + 24, hdr->addr4, ETH_ALEN);
|
||||
|
@ -196,7 +191,6 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
|
|||
ieee80211_ccmp_aes_encrypt(tfm, b0, s0);
|
||||
}
|
||||
|
||||
|
||||
static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
||||
{
|
||||
struct ieee80211_ccmp_data *key = priv;
|
||||
|
@ -209,8 +203,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
u8 *s0 = key->tx_s0;
|
||||
|
||||
if (skb_headroom(skb) < CCMP_HDR_LEN ||
|
||||
skb_tailroom(skb) < CCMP_MIC_LEN ||
|
||||
skb->len < hdr_len)
|
||||
skb_tailroom(skb) < CCMP_MIC_LEN || skb->len < hdr_len)
|
||||
return -1;
|
||||
|
||||
data_len = skb->len - hdr_len;
|
||||
|
@ -230,13 +223,13 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
*pos++ = key->tx_pn[5];
|
||||
*pos++ = key->tx_pn[4];
|
||||
*pos++ = 0;
|
||||
*pos++ = (key->key_idx << 6) | (1 << 5) /* Ext IV included */;
|
||||
*pos++ = (key->key_idx << 6) | (1 << 5) /* Ext IV included */ ;
|
||||
*pos++ = key->tx_pn[3];
|
||||
*pos++ = key->tx_pn[2];
|
||||
*pos++ = key->tx_pn[1];
|
||||
*pos++ = key->tx_pn[0];
|
||||
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
|
||||
|
||||
blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN;
|
||||
|
@ -261,7 +254,6 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
||||
{
|
||||
struct ieee80211_ccmp_data *key = priv;
|
||||
|
@ -280,7 +272,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
return -1;
|
||||
}
|
||||
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
pos = skb->data + hdr_len;
|
||||
keyidx = pos[3];
|
||||
if (!(keyidx & (1 << 5))) {
|
||||
|
@ -364,8 +356,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
return keyidx;
|
||||
}
|
||||
|
||||
|
||||
static int ieee80211_ccmp_set_key(void *key, int len, u8 *seq, void *priv)
|
||||
static int ieee80211_ccmp_set_key(void *key, int len, u8 * seq, void *priv)
|
||||
{
|
||||
struct ieee80211_ccmp_data *data = priv;
|
||||
int keyidx;
|
||||
|
@ -395,8 +386,7 @@ static int ieee80211_ccmp_set_key(void *key, int len, u8 *seq, void *priv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv)
|
||||
static int ieee80211_ccmp_get_key(void *key, int len, u8 * seq, void *priv)
|
||||
{
|
||||
struct ieee80211_ccmp_data *data = priv;
|
||||
|
||||
|
@ -419,8 +409,7 @@ static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv)
|
|||
return CCMP_TK_LEN;
|
||||
}
|
||||
|
||||
|
||||
static char * ieee80211_ccmp_print_stats(char *p, void *priv)
|
||||
static char *ieee80211_ccmp_print_stats(char *p, void *priv)
|
||||
{
|
||||
struct ieee80211_ccmp_data *ccmp = priv;
|
||||
p += sprintf(p, "key[%d] alg=CCMP key_set=%d "
|
||||
|
@ -436,7 +425,6 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv)
|
|||
return p;
|
||||
}
|
||||
|
||||
|
||||
static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
|
||||
.name = "CCMP",
|
||||
.init = ieee80211_ccmp_init,
|
||||
|
@ -453,18 +441,15 @@ static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
|
|||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
|
||||
static int __init ieee80211_crypto_ccmp_init(void)
|
||||
{
|
||||
return ieee80211_register_crypto_ops(&ieee80211_crypt_ccmp);
|
||||
}
|
||||
|
||||
|
||||
static void __exit ieee80211_crypto_ccmp_exit(void)
|
||||
{
|
||||
ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp);
|
||||
}
|
||||
|
||||
|
||||
module_init(ieee80211_crypto_ccmp_init);
|
||||
module_exit(ieee80211_crypto_ccmp_exit);
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
|
||||
#include <net/ieee80211.h>
|
||||
|
||||
|
||||
#include <linux/crypto.h>
|
||||
#include <asm/scatterlist.h>
|
||||
#include <linux/crc32.h>
|
||||
|
@ -62,7 +61,7 @@ struct ieee80211_tkip_data {
|
|||
u8 rx_hdr[16], tx_hdr[16];
|
||||
};
|
||||
|
||||
static void * ieee80211_tkip_init(int key_idx)
|
||||
static void *ieee80211_tkip_init(int key_idx)
|
||||
{
|
||||
struct ieee80211_tkip_data *priv;
|
||||
|
||||
|
@ -88,7 +87,7 @@ static void * ieee80211_tkip_init(int key_idx)
|
|||
|
||||
return priv;
|
||||
|
||||
fail:
|
||||
fail:
|
||||
if (priv) {
|
||||
if (priv->tfm_michael)
|
||||
crypto_free_tfm(priv->tfm_michael);
|
||||
|
@ -100,7 +99,6 @@ fail:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static void ieee80211_tkip_deinit(void *priv)
|
||||
{
|
||||
struct ieee80211_tkip_data *_priv = priv;
|
||||
|
@ -111,51 +109,42 @@ static void ieee80211_tkip_deinit(void *priv)
|
|||
kfree(priv);
|
||||
}
|
||||
|
||||
|
||||
static inline u16 RotR1(u16 val)
|
||||
{
|
||||
return (val >> 1) | (val << 15);
|
||||
}
|
||||
|
||||
|
||||
static inline u8 Lo8(u16 val)
|
||||
{
|
||||
return val & 0xff;
|
||||
}
|
||||
|
||||
|
||||
static inline u8 Hi8(u16 val)
|
||||
{
|
||||
return val >> 8;
|
||||
}
|
||||
|
||||
|
||||
static inline u16 Lo16(u32 val)
|
||||
{
|
||||
return val & 0xffff;
|
||||
}
|
||||
|
||||
|
||||
static inline u16 Hi16(u32 val)
|
||||
{
|
||||
return val >> 16;
|
||||
}
|
||||
|
||||
|
||||
static inline u16 Mk16(u8 hi, u8 lo)
|
||||
{
|
||||
return lo | (((u16) hi) << 8);
|
||||
}
|
||||
|
||||
|
||||
static inline u16 Mk16_le(u16 *v)
|
||||
static inline u16 Mk16_le(u16 * v)
|
||||
{
|
||||
return le16_to_cpu(*v);
|
||||
}
|
||||
|
||||
|
||||
static const u16 Sbox[256] =
|
||||
{
|
||||
static const u16 Sbox[256] = {
|
||||
0xC6A5, 0xF884, 0xEE99, 0xF68D, 0xFF0D, 0xD6BD, 0xDEB1, 0x9154,
|
||||
0x6050, 0x0203, 0xCEA9, 0x567D, 0xE719, 0xB562, 0x4DE6, 0xEC9A,
|
||||
0x8F45, 0x1F9D, 0x8940, 0xFA87, 0xEF15, 0xB2EB, 0x8EC9, 0xFB0B,
|
||||
|
@ -190,17 +179,16 @@ static const u16 Sbox[256] =
|
|||
0x82C3, 0x29B0, 0x5A77, 0x1E11, 0x7BCB, 0xA8FC, 0x6DD6, 0x2C3A,
|
||||
};
|
||||
|
||||
|
||||
static inline u16 _S_(u16 v)
|
||||
{
|
||||
u16 t = Sbox[Hi8(v)];
|
||||
return Sbox[Lo8(v)] ^ ((t << 8) | (t >> 8));
|
||||
}
|
||||
|
||||
|
||||
#define PHASE1_LOOP_COUNT 8
|
||||
|
||||
static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
|
||||
static void tkip_mixing_phase1(u16 * TTAK, const u8 * TK, const u8 * TA,
|
||||
u32 IV32)
|
||||
{
|
||||
int i, j;
|
||||
|
||||
|
@ -221,13 +209,12 @@ static void tkip_mixing_phase1(u16 *TTAK, const u8 *TK, const u8 *TA, u32 IV32)
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
|
||||
static void tkip_mixing_phase2(u8 * WEPSeed, const u8 * TK, const u16 * TTAK,
|
||||
u16 IV16)
|
||||
{
|
||||
/* Make temporary area overlap WEP seed so that the final copy can be
|
||||
* avoided on little endian hosts. */
|
||||
u16 *PPK = (u16 *) &WEPSeed[4];
|
||||
u16 *PPK = (u16 *) & WEPSeed[4];
|
||||
|
||||
/* Step 1 - make copy of TTAK and bring in TSC */
|
||||
PPK[0] = TTAK[0];
|
||||
|
@ -238,15 +225,15 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
|
|||
PPK[5] = TTAK[4] + IV16;
|
||||
|
||||
/* Step 2 - 96-bit bijective mixing using S-box */
|
||||
PPK[0] += _S_(PPK[5] ^ Mk16_le((u16 *) &TK[0]));
|
||||
PPK[1] += _S_(PPK[0] ^ Mk16_le((u16 *) &TK[2]));
|
||||
PPK[2] += _S_(PPK[1] ^ Mk16_le((u16 *) &TK[4]));
|
||||
PPK[3] += _S_(PPK[2] ^ Mk16_le((u16 *) &TK[6]));
|
||||
PPK[4] += _S_(PPK[3] ^ Mk16_le((u16 *) &TK[8]));
|
||||
PPK[5] += _S_(PPK[4] ^ Mk16_le((u16 *) &TK[10]));
|
||||
PPK[0] += _S_(PPK[5] ^ Mk16_le((u16 *) & TK[0]));
|
||||
PPK[1] += _S_(PPK[0] ^ Mk16_le((u16 *) & TK[2]));
|
||||
PPK[2] += _S_(PPK[1] ^ Mk16_le((u16 *) & TK[4]));
|
||||
PPK[3] += _S_(PPK[2] ^ Mk16_le((u16 *) & TK[6]));
|
||||
PPK[4] += _S_(PPK[3] ^ Mk16_le((u16 *) & TK[8]));
|
||||
PPK[5] += _S_(PPK[4] ^ Mk16_le((u16 *) & TK[10]));
|
||||
|
||||
PPK[0] += RotR1(PPK[5] ^ Mk16_le((u16 *) &TK[12]));
|
||||
PPK[1] += RotR1(PPK[0] ^ Mk16_le((u16 *) &TK[14]));
|
||||
PPK[0] += RotR1(PPK[5] ^ Mk16_le((u16 *) & TK[12]));
|
||||
PPK[1] += RotR1(PPK[0] ^ Mk16_le((u16 *) & TK[14]));
|
||||
PPK[2] += RotR1(PPK[1]);
|
||||
PPK[3] += RotR1(PPK[2]);
|
||||
PPK[4] += RotR1(PPK[3]);
|
||||
|
@ -257,7 +244,7 @@ static void tkip_mixing_phase2(u8 *WEPSeed, const u8 *TK, const u16 *TTAK,
|
|||
WEPSeed[0] = Hi8(IV16);
|
||||
WEPSeed[1] = (Hi8(IV16) | 0x20) & 0x7F;
|
||||
WEPSeed[2] = Lo8(IV16);
|
||||
WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((u16 *) &TK[0])) >> 1);
|
||||
WEPSeed[3] = Lo8((PPK[5] ^ Mk16_le((u16 *) & TK[0])) >> 1);
|
||||
|
||||
#ifdef __BIG_ENDIAN
|
||||
{
|
||||
|
@ -281,7 +268,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
skb->len < hdr_len)
|
||||
return -1;
|
||||
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
if (!tkey->tx_phase1_done) {
|
||||
tkip_mixing_phase1(tkey->tx_ttak, tkey->key, hdr->addr2,
|
||||
tkey->tx_iv32);
|
||||
|
@ -298,7 +285,7 @@ static int ieee80211_tkip_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
*pos++ = rc4key[0];
|
||||
*pos++ = rc4key[1];
|
||||
*pos++ = rc4key[2];
|
||||
*pos++ = (tkey->key_idx << 6) | (1 << 5) /* Ext IV included */;
|
||||
*pos++ = (tkey->key_idx << 6) | (1 << 5) /* Ext IV included */ ;
|
||||
*pos++ = tkey->tx_iv32 & 0xff;
|
||||
*pos++ = (tkey->tx_iv32 >> 8) & 0xff;
|
||||
*pos++ = (tkey->tx_iv32 >> 16) & 0xff;
|
||||
|
@ -341,7 +328,7 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
if (skb->len < hdr_len + 8 + 4)
|
||||
return -1;
|
||||
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
pos = skb->data + hdr_len;
|
||||
keyidx = pos[3];
|
||||
if (!(keyidx & (1 << 5))) {
|
||||
|
@ -427,9 +414,8 @@ static int ieee80211_tkip_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
return keyidx;
|
||||
}
|
||||
|
||||
|
||||
static int michael_mic(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
|
||||
u8 *data, size_t data_len, u8 *mic)
|
||||
static int michael_mic(struct ieee80211_tkip_data *tkey, u8 * key, u8 * hdr,
|
||||
u8 * data, size_t data_len, u8 * mic)
|
||||
{
|
||||
struct scatterlist sg[2];
|
||||
|
||||
|
@ -453,37 +439,37 @@ static int michael_mic(struct ieee80211_tkip_data *tkey, u8 *key, u8 *hdr,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static void michael_mic_hdr(struct sk_buff *skb, u8 *hdr)
|
||||
static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr)
|
||||
{
|
||||
struct ieee80211_hdr *hdr11;
|
||||
|
||||
hdr11 = (struct ieee80211_hdr *) skb->data;
|
||||
hdr11 = (struct ieee80211_hdr *)skb->data;
|
||||
switch (le16_to_cpu(hdr11->frame_ctl) &
|
||||
(IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) {
|
||||
case IEEE80211_FCTL_TODS:
|
||||
memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */
|
||||
memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
|
||||
memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */
|
||||
memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
|
||||
break;
|
||||
case IEEE80211_FCTL_FROMDS:
|
||||
memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */
|
||||
memcpy(hdr + ETH_ALEN, hdr11->addr3, ETH_ALEN); /* SA */
|
||||
memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */
|
||||
memcpy(hdr + ETH_ALEN, hdr11->addr3, ETH_ALEN); /* SA */
|
||||
break;
|
||||
case IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS:
|
||||
memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */
|
||||
memcpy(hdr + ETH_ALEN, hdr11->addr4, ETH_ALEN); /* SA */
|
||||
memcpy(hdr, hdr11->addr3, ETH_ALEN); /* DA */
|
||||
memcpy(hdr + ETH_ALEN, hdr11->addr4, ETH_ALEN); /* SA */
|
||||
break;
|
||||
case 0:
|
||||
memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */
|
||||
memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
|
||||
memcpy(hdr, hdr11->addr1, ETH_ALEN); /* DA */
|
||||
memcpy(hdr + ETH_ALEN, hdr11->addr2, ETH_ALEN); /* SA */
|
||||
break;
|
||||
}
|
||||
|
||||
hdr[12] = 0; /* priority */
|
||||
hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */
|
||||
hdr[12] = 0; /* priority */
|
||||
hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */
|
||||
}
|
||||
|
||||
|
||||
static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *priv)
|
||||
static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len,
|
||||
void *priv)
|
||||
{
|
||||
struct ieee80211_tkip_data *tkey = priv;
|
||||
u8 *pos;
|
||||
|
@ -504,11 +490,9 @@ static int ieee80211_michael_mic_add(struct sk_buff *skb, int hdr_len, void *pri
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#if WIRELESS_EXT >= 18
|
||||
static void ieee80211_michael_mic_failure(struct net_device *dev,
|
||||
struct ieee80211_hdr *hdr,
|
||||
int keyidx)
|
||||
struct ieee80211_hdr *hdr, int keyidx)
|
||||
{
|
||||
union iwreq_data wrqu;
|
||||
struct iw_michaelmicfailure ev;
|
||||
|
@ -524,12 +508,11 @@ static void ieee80211_michael_mic_failure(struct net_device *dev,
|
|||
memcpy(ev.src_addr.sa_data, hdr->addr2, ETH_ALEN);
|
||||
memset(&wrqu, 0, sizeof(wrqu));
|
||||
wrqu.data.length = sizeof(ev);
|
||||
wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *) &ev);
|
||||
wireless_send_event(dev, IWEVMICHAELMICFAILURE, &wrqu, (char *)&ev);
|
||||
}
|
||||
#elif WIRELESS_EXT >= 15
|
||||
static void ieee80211_michael_mic_failure(struct net_device *dev,
|
||||
struct ieee80211_hdr *hdr,
|
||||
int keyidx)
|
||||
struct ieee80211_hdr *hdr, int keyidx)
|
||||
{
|
||||
union iwreq_data wrqu;
|
||||
char buf[128];
|
||||
|
@ -542,17 +525,16 @@ static void ieee80211_michael_mic_failure(struct net_device *dev,
|
|||
wrqu.data.length = strlen(buf);
|
||||
wireless_send_event(dev, IWEVCUSTOM, &wrqu, buf);
|
||||
}
|
||||
#else /* WIRELESS_EXT >= 15 */
|
||||
#else /* WIRELESS_EXT >= 15 */
|
||||
static inline void ieee80211_michael_mic_failure(struct net_device *dev,
|
||||
struct ieee80211_hdr *hdr,
|
||||
int keyidx)
|
||||
struct ieee80211_hdr *hdr,
|
||||
int keyidx)
|
||||
{
|
||||
}
|
||||
#endif /* WIRELESS_EXT >= 15 */
|
||||
|
||||
#endif /* WIRELESS_EXT >= 15 */
|
||||
|
||||
static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
|
||||
int hdr_len, void *priv)
|
||||
int hdr_len, void *priv)
|
||||
{
|
||||
struct ieee80211_tkip_data *tkey = priv;
|
||||
u8 mic[8];
|
||||
|
@ -566,7 +548,7 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
|
|||
return -1;
|
||||
if (memcmp(mic, skb->data + skb->len - 8, 8) != 0) {
|
||||
struct ieee80211_hdr *hdr;
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
printk(KERN_DEBUG "%s: Michael MIC verification failed for "
|
||||
"MSDU from " MAC_FMT " keyidx=%d\n",
|
||||
skb->dev ? skb->dev->name : "N/A", MAC_ARG(hdr->addr2),
|
||||
|
@ -587,8 +569,7 @@ static int ieee80211_michael_mic_verify(struct sk_buff *skb, int keyidx,
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
|
||||
static int ieee80211_tkip_set_key(void *key, int len, u8 * seq, void *priv)
|
||||
{
|
||||
struct ieee80211_tkip_data *tkey = priv;
|
||||
int keyidx;
|
||||
|
@ -603,10 +584,10 @@ static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
|
|||
if (len == TKIP_KEY_LEN) {
|
||||
memcpy(tkey->key, key, TKIP_KEY_LEN);
|
||||
tkey->key_set = 1;
|
||||
tkey->tx_iv16 = 1; /* TSC is initialized to 1 */
|
||||
tkey->tx_iv16 = 1; /* TSC is initialized to 1 */
|
||||
if (seq) {
|
||||
tkey->rx_iv32 = (seq[5] << 24) | (seq[4] << 16) |
|
||||
(seq[3] << 8) | seq[2];
|
||||
(seq[3] << 8) | seq[2];
|
||||
tkey->rx_iv16 = (seq[1] << 8) | seq[0];
|
||||
}
|
||||
} else if (len == 0)
|
||||
|
@ -617,8 +598,7 @@ static int ieee80211_tkip_set_key(void *key, int len, u8 *seq, void *priv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int ieee80211_tkip_get_key(void *key, int len, u8 *seq, void *priv)
|
||||
static int ieee80211_tkip_get_key(void *key, int len, u8 * seq, void *priv)
|
||||
{
|
||||
struct ieee80211_tkip_data *tkey = priv;
|
||||
|
||||
|
@ -647,8 +627,7 @@ static int ieee80211_tkip_get_key(void *key, int len, u8 *seq, void *priv)
|
|||
return TKIP_KEY_LEN;
|
||||
}
|
||||
|
||||
|
||||
static char * ieee80211_tkip_print_stats(char *p, void *priv)
|
||||
static char *ieee80211_tkip_print_stats(char *p, void *priv)
|
||||
{
|
||||
struct ieee80211_tkip_data *tkip = priv;
|
||||
p += sprintf(p, "key[%d] alg=TKIP key_set=%d "
|
||||
|
@ -674,7 +653,6 @@ static char * ieee80211_tkip_print_stats(char *p, void *priv)
|
|||
return p;
|
||||
}
|
||||
|
||||
|
||||
static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
|
||||
.name = "TKIP",
|
||||
.init = ieee80211_tkip_init,
|
||||
|
@ -686,23 +664,20 @@ static struct ieee80211_crypto_ops ieee80211_crypt_tkip = {
|
|||
.set_key = ieee80211_tkip_set_key,
|
||||
.get_key = ieee80211_tkip_get_key,
|
||||
.print_stats = ieee80211_tkip_print_stats,
|
||||
.extra_prefix_len = 4 + 4, /* IV + ExtIV */
|
||||
.extra_postfix_len = 8 + 4, /* MIC + ICV */
|
||||
.owner = THIS_MODULE,
|
||||
.extra_prefix_len = 4 + 4, /* IV + ExtIV */
|
||||
.extra_postfix_len = 8 + 4, /* MIC + ICV */
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
|
||||
static int __init ieee80211_crypto_tkip_init(void)
|
||||
{
|
||||
return ieee80211_register_crypto_ops(&ieee80211_crypt_tkip);
|
||||
}
|
||||
|
||||
|
||||
static void __exit ieee80211_crypto_tkip_exit(void)
|
||||
{
|
||||
ieee80211_unregister_crypto_ops(&ieee80211_crypt_tkip);
|
||||
}
|
||||
|
||||
|
||||
module_init(ieee80211_crypto_tkip_init);
|
||||
module_exit(ieee80211_crypto_tkip_exit);
|
||||
|
|
|
@ -20,7 +20,6 @@
|
|||
|
||||
#include <net/ieee80211.h>
|
||||
|
||||
|
||||
#include <linux/crypto.h>
|
||||
#include <asm/scatterlist.h>
|
||||
#include <linux/crc32.h>
|
||||
|
@ -29,7 +28,6 @@ MODULE_AUTHOR("Jouni Malinen");
|
|||
MODULE_DESCRIPTION("Host AP crypt: WEP");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
||||
struct prism2_wep_data {
|
||||
u32 iv;
|
||||
#define WEP_KEY_LEN 13
|
||||
|
@ -39,8 +37,7 @@ struct prism2_wep_data {
|
|||
struct crypto_tfm *tfm;
|
||||
};
|
||||
|
||||
|
||||
static void * prism2_wep_init(int keyidx)
|
||||
static void *prism2_wep_init(int keyidx)
|
||||
{
|
||||
struct prism2_wep_data *priv;
|
||||
|
||||
|
@ -62,7 +59,7 @@ static void * prism2_wep_init(int keyidx)
|
|||
|
||||
return priv;
|
||||
|
||||
fail:
|
||||
fail:
|
||||
if (priv) {
|
||||
if (priv->tfm)
|
||||
crypto_free_tfm(priv->tfm);
|
||||
|
@ -71,7 +68,6 @@ fail:
|
|||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static void prism2_wep_deinit(void *priv)
|
||||
{
|
||||
struct prism2_wep_data *_priv = priv;
|
||||
|
@ -80,7 +76,6 @@ static void prism2_wep_deinit(void *priv)
|
|||
kfree(priv);
|
||||
}
|
||||
|
||||
|
||||
/* Perform WEP encryption on given skb that has at least 4 bytes of headroom
|
||||
* for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted,
|
||||
* so the payload length increases with 8 bytes.
|
||||
|
@ -143,7 +138,6 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* Perform WEP decryption on given buffer. Buffer includes whole WEP part of
|
||||
* the frame: IV (4 bytes), encrypted payload (including SNAP header),
|
||||
* ICV (4 bytes). len includes both IV and ICV.
|
||||
|
@ -202,8 +196,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int prism2_wep_set_key(void *key, int len, u8 *seq, void *priv)
|
||||
static int prism2_wep_set_key(void *key, int len, u8 * seq, void *priv)
|
||||
{
|
||||
struct prism2_wep_data *wep = priv;
|
||||
|
||||
|
@ -216,8 +209,7 @@ static int prism2_wep_set_key(void *key, int len, u8 *seq, void *priv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static int prism2_wep_get_key(void *key, int len, u8 *seq, void *priv)
|
||||
static int prism2_wep_get_key(void *key, int len, u8 * seq, void *priv)
|
||||
{
|
||||
struct prism2_wep_data *wep = priv;
|
||||
|
||||
|
@ -229,16 +221,13 @@ static int prism2_wep_get_key(void *key, int len, u8 *seq, void *priv)
|
|||
return wep->key_len;
|
||||
}
|
||||
|
||||
|
||||
static char * prism2_wep_print_stats(char *p, void *priv)
|
||||
static char *prism2_wep_print_stats(char *p, void *priv)
|
||||
{
|
||||
struct prism2_wep_data *wep = priv;
|
||||
p += sprintf(p, "key[%d] alg=WEP len=%d\n",
|
||||
wep->key_idx, wep->key_len);
|
||||
p += sprintf(p, "key[%d] alg=WEP len=%d\n", wep->key_idx, wep->key_len);
|
||||
return p;
|
||||
}
|
||||
|
||||
|
||||
static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
|
||||
.name = "WEP",
|
||||
.init = prism2_wep_init,
|
||||
|
@ -250,23 +239,20 @@ static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
|
|||
.set_key = prism2_wep_set_key,
|
||||
.get_key = prism2_wep_get_key,
|
||||
.print_stats = prism2_wep_print_stats,
|
||||
.extra_prefix_len = 4, /* IV */
|
||||
.extra_postfix_len = 4, /* ICV */
|
||||
.extra_prefix_len = 4, /* IV */
|
||||
.extra_postfix_len = 4, /* ICV */
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
|
||||
static int __init ieee80211_crypto_wep_init(void)
|
||||
{
|
||||
return ieee80211_register_crypto_ops(&ieee80211_crypt_wep);
|
||||
}
|
||||
|
||||
|
||||
static void __exit ieee80211_crypto_wep_exit(void)
|
||||
{
|
||||
ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep);
|
||||
}
|
||||
|
||||
|
||||
module_init(ieee80211_crypto_wep_init);
|
||||
module_exit(ieee80211_crypto_wep_exit);
|
||||
|
|
|
@ -54,7 +54,8 @@
|
|||
#include <net/ieee80211.h>
|
||||
|
||||
MODULE_DESCRIPTION("802.11 data/management/control stack");
|
||||
MODULE_AUTHOR("Copyright (C) 2004 Intel Corporation <jketreno@linux.intel.com>");
|
||||
MODULE_AUTHOR
|
||||
("Copyright (C) 2004 Intel Corporation <jketreno@linux.intel.com>");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
#define DRV_NAME "ieee80211"
|
||||
|
@ -64,9 +65,9 @@ static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
|
|||
if (ieee->networks)
|
||||
return 0;
|
||||
|
||||
ieee->networks = kmalloc(
|
||||
MAX_NETWORK_COUNT * sizeof(struct ieee80211_network),
|
||||
GFP_KERNEL);
|
||||
ieee->networks =
|
||||
kmalloc(MAX_NETWORK_COUNT * sizeof(struct ieee80211_network),
|
||||
GFP_KERNEL);
|
||||
if (!ieee->networks) {
|
||||
printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
|
||||
ieee->dev->name);
|
||||
|
@ -94,10 +95,10 @@ static inline void ieee80211_networks_initialize(struct ieee80211_device *ieee)
|
|||
INIT_LIST_HEAD(&ieee->network_free_list);
|
||||
INIT_LIST_HEAD(&ieee->network_list);
|
||||
for (i = 0; i < MAX_NETWORK_COUNT; i++)
|
||||
list_add_tail(&ieee->networks[i].list, &ieee->network_free_list);
|
||||
list_add_tail(&ieee->networks[i].list,
|
||||
&ieee->network_free_list);
|
||||
}
|
||||
|
||||
|
||||
struct net_device *alloc_ieee80211(int sizeof_priv)
|
||||
{
|
||||
struct ieee80211_device *ieee;
|
||||
|
@ -118,8 +119,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
|
|||
|
||||
err = ieee80211_networks_allocate(ieee);
|
||||
if (err) {
|
||||
IEEE80211_ERROR("Unable to allocate beacon storage: %d\n",
|
||||
err);
|
||||
IEEE80211_ERROR("Unable to allocate beacon storage: %d\n", err);
|
||||
goto failed;
|
||||
}
|
||||
ieee80211_networks_initialize(ieee);
|
||||
|
@ -132,7 +132,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
|
|||
/* Default to enabling full open WEP with host based encrypt/decrypt */
|
||||
ieee->host_encrypt = 1;
|
||||
ieee->host_decrypt = 1;
|
||||
ieee->ieee802_1x = 1; /* Default to supporting 802.1x */
|
||||
ieee->ieee802_1x = 1; /* Default to supporting 802.1x */
|
||||
|
||||
INIT_LIST_HEAD(&ieee->crypt_deinit_list);
|
||||
init_timer(&ieee->crypt_deinit_timer);
|
||||
|
@ -141,21 +141,20 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
|
|||
|
||||
spin_lock_init(&ieee->lock);
|
||||
|
||||
ieee->wpa_enabled = 0;
|
||||
ieee->tkip_countermeasures = 0;
|
||||
ieee->drop_unencrypted = 0;
|
||||
ieee->privacy_invoked = 0;
|
||||
ieee->ieee802_1x = 1;
|
||||
ieee->wpa_enabled = 0;
|
||||
ieee->tkip_countermeasures = 0;
|
||||
ieee->drop_unencrypted = 0;
|
||||
ieee->privacy_invoked = 0;
|
||||
ieee->ieee802_1x = 1;
|
||||
|
||||
return dev;
|
||||
|
||||
failed:
|
||||
failed:
|
||||
if (dev)
|
||||
free_netdev(dev);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
void free_ieee80211(struct net_device *dev)
|
||||
{
|
||||
struct ieee80211_device *ieee = netdev_priv(dev);
|
||||
|
@ -193,7 +192,7 @@ static int show_debug_level(char *page, char **start, off_t offset,
|
|||
return snprintf(page, count, "0x%08X\n", ieee80211_debug_level);
|
||||
}
|
||||
|
||||
static int store_debug_level(struct file *file, const char __user *buffer,
|
||||
static int store_debug_level(struct file *file, const char __user * buffer,
|
||||
unsigned long count, void *data)
|
||||
{
|
||||
char buf[] = "0x00000000";
|
||||
|
@ -264,13 +263,12 @@ static void __exit ieee80211_exit(void)
|
|||
module_param(debug, int, 0444);
|
||||
MODULE_PARM_DESC(debug, "debug output mask");
|
||||
|
||||
|
||||
module_exit(ieee80211_exit);
|
||||
module_init(ieee80211_init);
|
||||
#endif
|
||||
|
||||
|
||||
const char *escape_essid(const char *essid, u8 essid_len) {
|
||||
const char *escape_essid(const char *essid, u8 essid_len)
|
||||
{
|
||||
static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
|
||||
const char *s = essid;
|
||||
char *d = escaped;
|
||||
|
@ -280,7 +278,7 @@ const char *escape_essid(const char *essid, u8 essid_len) {
|
|||
return escaped;
|
||||
}
|
||||
|
||||
essid_len = min(essid_len, (u8)IW_ESSID_MAX_SIZE);
|
||||
essid_len = min(essid_len, (u8) IW_ESSID_MAX_SIZE);
|
||||
while (essid_len--) {
|
||||
if (*s == '\0') {
|
||||
*d++ = '\\';
|
||||
|
|
|
@ -52,11 +52,14 @@ static inline void ieee80211_monitor_rx(struct ieee80211_device *ieee,
|
|||
netif_rx(skb);
|
||||
}
|
||||
|
||||
|
||||
/* Called only as a tasklet (software IRQ) */
|
||||
static struct ieee80211_frag_entry *
|
||||
ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq,
|
||||
unsigned int frag, u8 *src, u8 *dst)
|
||||
static struct ieee80211_frag_entry *ieee80211_frag_cache_find(struct
|
||||
ieee80211_device
|
||||
*ieee,
|
||||
unsigned int seq,
|
||||
unsigned int frag,
|
||||
u8 * src,
|
||||
u8 * dst)
|
||||
{
|
||||
struct ieee80211_frag_entry *entry;
|
||||
int i;
|
||||
|
@ -65,10 +68,9 @@ ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq,
|
|||
entry = &ieee->frag_cache[i];
|
||||
if (entry->skb != NULL &&
|
||||
time_after(jiffies, entry->first_frag_time + 2 * HZ)) {
|
||||
IEEE80211_DEBUG_FRAG(
|
||||
"expiring fragment cache entry "
|
||||
"seq=%u last_frag=%u\n",
|
||||
entry->seq, entry->last_frag);
|
||||
IEEE80211_DEBUG_FRAG("expiring fragment cache entry "
|
||||
"seq=%u last_frag=%u\n",
|
||||
entry->seq, entry->last_frag);
|
||||
dev_kfree_skb_any(entry->skb);
|
||||
entry->skb = NULL;
|
||||
}
|
||||
|
@ -84,9 +86,8 @@ ieee80211_frag_cache_find(struct ieee80211_device *ieee, unsigned int seq,
|
|||
}
|
||||
|
||||
/* Called only as a tasklet (software IRQ) */
|
||||
static struct sk_buff *
|
||||
ieee80211_frag_cache_get(struct ieee80211_device *ieee,
|
||||
struct ieee80211_hdr *hdr)
|
||||
static struct sk_buff *ieee80211_frag_cache_get(struct ieee80211_device *ieee,
|
||||
struct ieee80211_hdr *hdr)
|
||||
{
|
||||
struct sk_buff *skb = NULL;
|
||||
u16 sc;
|
||||
|
@ -101,9 +102,9 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,
|
|||
/* Reserve enough space to fit maximum frame length */
|
||||
skb = dev_alloc_skb(ieee->dev->mtu +
|
||||
sizeof(struct ieee80211_hdr) +
|
||||
8 /* LLC */ +
|
||||
2 /* alignment */ +
|
||||
8 /* WEP */ + ETH_ALEN /* WDS */);
|
||||
8 /* LLC */ +
|
||||
2 /* alignment */ +
|
||||
8 /* WEP */ + ETH_ALEN /* WDS */ );
|
||||
if (skb == NULL)
|
||||
return NULL;
|
||||
|
||||
|
@ -135,7 +136,6 @@ ieee80211_frag_cache_get(struct ieee80211_device *ieee,
|
|||
return skb;
|
||||
}
|
||||
|
||||
|
||||
/* Called only as a tasklet (software IRQ) */
|
||||
static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
|
||||
struct ieee80211_hdr *hdr)
|
||||
|
@ -151,9 +151,8 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
|
|||
hdr->addr1);
|
||||
|
||||
if (entry == NULL) {
|
||||
IEEE80211_DEBUG_FRAG(
|
||||
"could not invalidate fragment cache "
|
||||
"entry (seq=%u)\n", seq);
|
||||
IEEE80211_DEBUG_FRAG("could not invalidate fragment cache "
|
||||
"entry (seq=%u)\n", seq);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -161,7 +160,6 @@ static int ieee80211_frag_cache_invalidate(struct ieee80211_device *ieee,
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
#ifdef NOT_YET
|
||||
/* ieee80211_rx_frame_mgtmt
|
||||
*
|
||||
|
@ -201,7 +199,7 @@ ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (ieee->iw_mode == IW_MODE_MASTER) {
|
||||
if (ieee->iw_mode == IW_MODE_MASTER) {
|
||||
if (type != WLAN_FC_TYPE_MGMT && type != WLAN_FC_TYPE_CTRL) {
|
||||
printk(KERN_DEBUG "%s: unknown management frame "
|
||||
"(type=0x%02x, stype=0x%02x) dropped\n",
|
||||
|
@ -219,14 +217,13 @@ ieee80211_rx_frame_mgmt(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
}
|
||||
#endif
|
||||
|
||||
|
||||
/* See IEEE 802.1H for LLC/SNAP encapsulation/decapsulation */
|
||||
/* Ethernet-II snap header (RFC1042 for most EtherTypes) */
|
||||
static unsigned char rfc1042_header[] =
|
||||
{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
|
||||
static unsigned char rfc1042_header[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
|
||||
|
||||
/* Bridge-Tunnel header (for EtherTypes ETH_P_AARP and ETH_P_IPX) */
|
||||
static unsigned char bridge_tunnel_header[] =
|
||||
{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
|
||||
{ 0xaa, 0xaa, 0x03, 0x00, 0x00, 0xf8 };
|
||||
/* No encapsulation header if EtherType < 0x600 (=length) */
|
||||
|
||||
/* Called by ieee80211_rx_frame_decrypt */
|
||||
|
@ -241,7 +238,7 @@ static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee,
|
|||
if (skb->len < 24)
|
||||
return 0;
|
||||
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
fc = le16_to_cpu(hdr->frame_ctl);
|
||||
|
||||
/* check that the frame is unicast frame to us */
|
||||
|
@ -271,7 +268,7 @@ static int ieee80211_is_eapol_frame(struct ieee80211_device *ieee,
|
|||
|
||||
/* Called only as a tasklet (software IRQ), by ieee80211_rx */
|
||||
static inline int
|
||||
ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
|
||||
ieee80211_rx_frame_decrypt(struct ieee80211_device *ieee, struct sk_buff *skb,
|
||||
struct ieee80211_crypt_data *crypt)
|
||||
{
|
||||
struct ieee80211_hdr *hdr;
|
||||
|
@ -280,12 +277,11 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
|
|||
if (crypt == NULL || crypt->ops->decrypt_mpdu == NULL)
|
||||
return 0;
|
||||
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
|
||||
|
||||
#ifdef CONFIG_IEEE80211_CRYPT_TKIP
|
||||
if (ieee->tkip_countermeasures &&
|
||||
strcmp(crypt->ops->name, "TKIP") == 0) {
|
||||
if (ieee->tkip_countermeasures && strcmp(crypt->ops->name, "TKIP") == 0) {
|
||||
if (net_ratelimit()) {
|
||||
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
|
||||
"received packet from " MAC_FMT "\n",
|
||||
|
@ -299,9 +295,8 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
|
|||
res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
|
||||
atomic_dec(&crypt->refcnt);
|
||||
if (res < 0) {
|
||||
IEEE80211_DEBUG_DROP(
|
||||
"decryption failed (SA=" MAC_FMT
|
||||
") res=%d\n", MAC_ARG(hdr->addr2), res);
|
||||
IEEE80211_DEBUG_DROP("decryption failed (SA=" MAC_FMT
|
||||
") res=%d\n", MAC_ARG(hdr->addr2), res);
|
||||
if (res == -2)
|
||||
IEEE80211_DEBUG_DROP("Decryption failed ICV "
|
||||
"mismatch (key %d)\n",
|
||||
|
@ -313,11 +308,11 @@ ieee80211_rx_frame_decrypt(struct ieee80211_device* ieee, struct sk_buff *skb,
|
|||
return res;
|
||||
}
|
||||
|
||||
|
||||
/* Called only as a tasklet (software IRQ), by ieee80211_rx */
|
||||
static inline int
|
||||
ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *skb,
|
||||
int keyidx, struct ieee80211_crypt_data *crypt)
|
||||
ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device *ieee,
|
||||
struct sk_buff *skb, int keyidx,
|
||||
struct ieee80211_crypt_data *crypt)
|
||||
{
|
||||
struct ieee80211_hdr *hdr;
|
||||
int res, hdrlen;
|
||||
|
@ -325,7 +320,7 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *s
|
|||
if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
|
||||
return 0;
|
||||
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
hdrlen = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
|
||||
|
||||
atomic_inc(&crypt->refcnt);
|
||||
|
@ -341,7 +336,6 @@ ieee80211_rx_frame_decrypt_msdu(struct ieee80211_device* ieee, struct sk_buff *s
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/* All received frames are sent to this function. @skb contains the frame in
|
||||
* IEEE 802.11 format, i.e., in the format it was sent over air.
|
||||
* This function is called only as a tasklet (software IRQ). */
|
||||
|
@ -373,8 +367,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
stats = &ieee->stats;
|
||||
|
||||
if (skb->len < 10) {
|
||||
printk(KERN_INFO "%s: SKB length < 10\n",
|
||||
dev->name);
|
||||
printk(KERN_INFO "%s: SKB length < 10\n", dev->name);
|
||||
goto rx_dropped;
|
||||
}
|
||||
|
||||
|
@ -399,8 +392,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
/* Update spy records */
|
||||
wireless_spy_update(dev, hdr->addr2, &wstats);
|
||||
}
|
||||
#endif /* IW_WIRELESS_SPY */
|
||||
#endif /* WIRELESS_EXT > 15 */
|
||||
#endif /* IW_WIRELESS_SPY */
|
||||
#endif /* WIRELESS_EXT > 15 */
|
||||
hostap_update_rx_stats(local->ap, hdr, rx_stats);
|
||||
#endif
|
||||
|
||||
|
@ -429,8 +422,8 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
* stations that do not support WEP key mapping). */
|
||||
|
||||
if (!(hdr->addr1[0] & 0x01) || local->bcrx_sta_key)
|
||||
(void) hostap_handle_sta_crypto(local, hdr, &crypt,
|
||||
&sta);
|
||||
(void)hostap_handle_sta_crypto(local, hdr, &crypt,
|
||||
&sta);
|
||||
#endif
|
||||
|
||||
/* allow NULL decrypt to indicate an station specific override
|
||||
|
@ -451,13 +444,11 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
goto rx_dropped;
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef NOT_YET
|
||||
if (type != WLAN_FC_TYPE_DATA) {
|
||||
if (type == WLAN_FC_TYPE_MGMT && stype == WLAN_FC_STYPE_AUTH &&
|
||||
fc & IEEE80211_FCTL_PROTECTED && ieee->host_decrypt &&
|
||||
(keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0)
|
||||
{
|
||||
(keyidx = hostap_rx_frame_decrypt(ieee, skb, crypt)) < 0) {
|
||||
printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
|
||||
"from " MAC_FMT "\n", dev->name,
|
||||
MAC_ARG(hdr->addr2));
|
||||
|
@ -507,9 +498,9 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
}
|
||||
|
||||
if (ieee->iw_mode == IW_MODE_MASTER && !wds &&
|
||||
(fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) == IEEE80211_FCTL_FROMDS &&
|
||||
ieee->stadev &&
|
||||
memcmp(hdr->addr2, ieee->assoc_ap_addr, ETH_ALEN) == 0) {
|
||||
(fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
|
||||
IEEE80211_FCTL_FROMDS && ieee->stadev
|
||||
&& memcmp(hdr->addr2, ieee->assoc_ap_addr, ETH_ALEN) == 0) {
|
||||
/* Frame from BSSID of the AP for which we are a client */
|
||||
skb->dev = dev = ieee->stadev;
|
||||
stats = hostap_get_stats(dev);
|
||||
|
@ -521,8 +512,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
|
||||
#ifdef NOT_YET
|
||||
if ((ieee->iw_mode == IW_MODE_MASTER ||
|
||||
ieee->iw_mode == IW_MODE_REPEAT) &&
|
||||
!from_assoc_ap) {
|
||||
ieee->iw_mode == IW_MODE_REPEAT) && !from_assoc_ap) {
|
||||
switch (hostap_handle_sta_rx(ieee, dev, skb, rx_stats,
|
||||
wds != NULL)) {
|
||||
case AP_RX_CONTINUE_NOT_AUTHORIZED:
|
||||
|
@ -546,11 +536,10 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
stype != IEEE80211_STYPE_DATA_CFPOLL &&
|
||||
stype != IEEE80211_STYPE_DATA_CFACKPOLL) {
|
||||
if (stype != IEEE80211_STYPE_NULLFUNC)
|
||||
IEEE80211_DEBUG_DROP(
|
||||
"RX: dropped data frame "
|
||||
"with no data (type=0x%02x, "
|
||||
"subtype=0x%02x, len=%d)\n",
|
||||
type, stype, skb->len);
|
||||
IEEE80211_DEBUG_DROP("RX: dropped data frame "
|
||||
"with no data (type=0x%02x, "
|
||||
"subtype=0x%02x, len=%d)\n",
|
||||
type, stype, skb->len);
|
||||
goto rx_dropped;
|
||||
}
|
||||
|
||||
|
@ -560,7 +549,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
(keyidx = ieee80211_rx_frame_decrypt(ieee, skb, crypt)) < 0)
|
||||
goto rx_dropped;
|
||||
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
|
||||
/* skb: hdr + (possibly fragmented) plaintext payload */
|
||||
// PR: FIXME: hostap has additional conditions in the "if" below:
|
||||
|
@ -614,7 +603,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
/* this was the last fragment and the frame will be
|
||||
* delivered, so remove skb from fragment cache */
|
||||
skb = frag_skb;
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
ieee80211_frag_cache_invalidate(ieee, hdr);
|
||||
}
|
||||
|
||||
|
@ -624,28 +613,26 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
ieee80211_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt))
|
||||
goto rx_dropped;
|
||||
|
||||
hdr = (struct ieee80211_hdr *) skb->data;
|
||||
hdr = (struct ieee80211_hdr *)skb->data;
|
||||
if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep) {
|
||||
if (/*ieee->ieee802_1x &&*/
|
||||
ieee80211_is_eapol_frame(ieee, skb)) {
|
||||
if ( /*ieee->ieee802_1x && */
|
||||
ieee80211_is_eapol_frame(ieee, skb)) {
|
||||
/* pass unencrypted EAPOL frames even if encryption is
|
||||
* configured */
|
||||
} else {
|
||||
IEEE80211_DEBUG_DROP(
|
||||
"encryption configured, but RX "
|
||||
"frame not encrypted (SA=" MAC_FMT ")\n",
|
||||
MAC_ARG(hdr->addr2));
|
||||
IEEE80211_DEBUG_DROP("encryption configured, but RX "
|
||||
"frame not encrypted (SA=" MAC_FMT
|
||||
")\n", MAC_ARG(hdr->addr2));
|
||||
goto rx_dropped;
|
||||
}
|
||||
}
|
||||
|
||||
if (crypt && !(fc & IEEE80211_FCTL_PROTECTED) && !ieee->open_wep &&
|
||||
!ieee80211_is_eapol_frame(ieee, skb)) {
|
||||
IEEE80211_DEBUG_DROP(
|
||||
"dropped unencrypted RX data "
|
||||
"frame from " MAC_FMT
|
||||
" (drop_unencrypted=1)\n",
|
||||
MAC_ARG(hdr->addr2));
|
||||
IEEE80211_DEBUG_DROP("dropped unencrypted RX data "
|
||||
"frame from " MAC_FMT
|
||||
" (drop_unencrypted=1)\n",
|
||||
MAC_ARG(hdr->addr2));
|
||||
goto rx_dropped;
|
||||
}
|
||||
|
||||
|
@ -673,8 +660,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
} else if (!frame_authorized) {
|
||||
printk(KERN_DEBUG "%s: dropped frame from "
|
||||
"unauthorized port (IEEE 802.1X): "
|
||||
"ethertype=0x%04x\n",
|
||||
dev->name, ethertype);
|
||||
"ethertype=0x%04x\n", dev->name, ethertype);
|
||||
goto rx_dropped;
|
||||
}
|
||||
}
|
||||
|
@ -702,8 +688,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
|
||||
#ifdef NOT_YET
|
||||
if (wds && ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==
|
||||
IEEE80211_FCTL_TODS) &&
|
||||
skb->len >= ETH_HLEN + ETH_ALEN) {
|
||||
IEEE80211_FCTL_TODS) && skb->len >= ETH_HLEN + ETH_ALEN) {
|
||||
/* Non-standard frame: get addr4 from its bogus location after
|
||||
* the payload */
|
||||
memcpy(skb->data + ETH_ALEN,
|
||||
|
@ -716,8 +701,7 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
stats->rx_bytes += skb->len;
|
||||
|
||||
#ifdef NOT_YET
|
||||
if (ieee->iw_mode == IW_MODE_MASTER && !wds &&
|
||||
ieee->ap->bridge_packets) {
|
||||
if (ieee->iw_mode == IW_MODE_MASTER && !wds && ieee->ap->bridge_packets) {
|
||||
if (dst[0] & 0x01) {
|
||||
/* copy multicast frame both to the higher layers and
|
||||
* to the wireless media */
|
||||
|
@ -743,25 +727,24 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
|
|||
skb2->dev = dev;
|
||||
dev_queue_xmit(skb2);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
if (skb) {
|
||||
skb->protocol = eth_type_trans(skb, dev);
|
||||
memset(skb->cb, 0, sizeof(skb->cb));
|
||||
skb->dev = dev;
|
||||
skb->ip_summed = CHECKSUM_NONE; /* 802.11 crc not sufficient */
|
||||
skb->ip_summed = CHECKSUM_NONE; /* 802.11 crc not sufficient */
|
||||
netif_rx(skb);
|
||||
}
|
||||
|
||||
rx_exit:
|
||||
rx_exit:
|
||||
#ifdef NOT_YET
|
||||
if (sta)
|
||||
hostap_handle_sta_release(sta);
|
||||
#endif
|
||||
return 1;
|
||||
|
||||
rx_dropped:
|
||||
rx_dropped:
|
||||
stats->rx_dropped++;
|
||||
|
||||
/* Returning 0 indicates to caller that we have not handled the SKB--
|
||||
|
@ -785,22 +768,21 @@ static inline int ieee80211_is_ofdm_rate(u8 rate)
|
|||
case IEEE80211_OFDM_RATE_54MB:
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static inline int ieee80211_network_init(
|
||||
struct ieee80211_device *ieee,
|
||||
struct ieee80211_probe_response *beacon,
|
||||
struct ieee80211_network *network,
|
||||
struct ieee80211_rx_stats *stats)
|
||||
static inline int ieee80211_network_init(struct ieee80211_device *ieee,
|
||||
struct ieee80211_probe_response
|
||||
*beacon,
|
||||
struct ieee80211_network *network,
|
||||
struct ieee80211_rx_stats *stats)
|
||||
{
|
||||
#ifdef CONFIG_IEEE80211_DEBUG
|
||||
char rates_str[64];
|
||||
char *p;
|
||||
#endif
|
||||
struct ieee80211_info_element *info_element;
|
||||
u16 left;
|
||||
u16 left;
|
||||
u8 i;
|
||||
|
||||
/* Pull out fixed field data */
|
||||
|
@ -810,7 +792,7 @@ static inline int ieee80211_network_init(
|
|||
network->time_stamp[0] = beacon->time_stamp[0];
|
||||
network->time_stamp[1] = beacon->time_stamp[1];
|
||||
network->beacon_interval = beacon->beacon_interval;
|
||||
/* Where to pull this? beacon->listen_interval;*/
|
||||
/* Where to pull this? beacon->listen_interval; */
|
||||
network->listen_interval = 0x0A;
|
||||
network->rates_len = network->rates_ex_len = 0;
|
||||
network->last_associate = 0;
|
||||
|
@ -824,18 +806,20 @@ static inline int ieee80211_network_init(
|
|||
} else
|
||||
network->flags |= NETWORK_HAS_CCK;
|
||||
|
||||
network->wpa_ie_len = 0;
|
||||
network->rsn_ie_len = 0;
|
||||
network->wpa_ie_len = 0;
|
||||
network->rsn_ie_len = 0;
|
||||
|
||||
info_element = &beacon->info_element;
|
||||
info_element = &beacon->info_element;
|
||||
left = stats->len - ((void *)info_element - (void *)beacon);
|
||||
while (left >= sizeof(struct ieee80211_info_element_hdr)) {
|
||||
if (sizeof(struct ieee80211_info_element_hdr) + info_element->len > left) {
|
||||
IEEE80211_DEBUG_SCAN("SCAN: parse failed: info_element->len + 2 > left : info_element->len+2=%Zd left=%d.\n",
|
||||
info_element->len + sizeof(struct ieee80211_info_element),
|
||||
left);
|
||||
if (sizeof(struct ieee80211_info_element_hdr) +
|
||||
info_element->len > left) {
|
||||
IEEE80211_DEBUG_SCAN
|
||||
("SCAN: parse failed: info_element->len + 2 > left : info_element->len+2=%Zd left=%d.\n",
|
||||
info_element->len +
|
||||
sizeof(struct ieee80211_info_element), left);
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
switch (info_element->id) {
|
||||
case MFIE_TYPE_SSID:
|
||||
|
@ -846,10 +830,11 @@ static inline int ieee80211_network_init(
|
|||
}
|
||||
|
||||
network->ssid_len = min(info_element->len,
|
||||
(u8)IW_ESSID_MAX_SIZE);
|
||||
memcpy(network->ssid, info_element->data, network->ssid_len);
|
||||
if (network->ssid_len < IW_ESSID_MAX_SIZE)
|
||||
memset(network->ssid + network->ssid_len, 0,
|
||||
(u8) IW_ESSID_MAX_SIZE);
|
||||
memcpy(network->ssid, info_element->data,
|
||||
network->ssid_len);
|
||||
if (network->ssid_len < IW_ESSID_MAX_SIZE)
|
||||
memset(network->ssid + network->ssid_len, 0,
|
||||
IW_ESSID_MAX_SIZE - network->ssid_len);
|
||||
|
||||
IEEE80211_DEBUG_SCAN("MFIE_TYPE_SSID: '%s' len=%d.\n",
|
||||
|
@ -860,18 +845,23 @@ static inline int ieee80211_network_init(
|
|||
#ifdef CONFIG_IEEE80211_DEBUG
|
||||
p = rates_str;
|
||||
#endif
|
||||
network->rates_len = min(info_element->len, MAX_RATES_LENGTH);
|
||||
network->rates_len =
|
||||
min(info_element->len, MAX_RATES_LENGTH);
|
||||
for (i = 0; i < network->rates_len; i++) {
|
||||
network->rates[i] = info_element->data[i];
|
||||
#ifdef CONFIG_IEEE80211_DEBUG
|
||||
p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->rates[i]);
|
||||
p += snprintf(p,
|
||||
sizeof(rates_str) - (p -
|
||||
rates_str),
|
||||
"%02X ", network->rates[i]);
|
||||
#endif
|
||||
if (ieee80211_is_ofdm_rate(info_element->data[i])) {
|
||||
if (ieee80211_is_ofdm_rate
|
||||
(info_element->data[i])) {
|
||||
network->flags |= NETWORK_HAS_OFDM;
|
||||
if (info_element->data[i] &
|
||||
IEEE80211_BASIC_RATE_MASK)
|
||||
network->flags &=
|
||||
~NETWORK_HAS_CCK;
|
||||
~NETWORK_HAS_CCK;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -883,18 +873,23 @@ static inline int ieee80211_network_init(
|
|||
#ifdef CONFIG_IEEE80211_DEBUG
|
||||
p = rates_str;
|
||||
#endif
|
||||
network->rates_ex_len = min(info_element->len, MAX_RATES_EX_LENGTH);
|
||||
network->rates_ex_len =
|
||||
min(info_element->len, MAX_RATES_EX_LENGTH);
|
||||
for (i = 0; i < network->rates_ex_len; i++) {
|
||||
network->rates_ex[i] = info_element->data[i];
|
||||
#ifdef CONFIG_IEEE80211_DEBUG
|
||||
p += snprintf(p, sizeof(rates_str) - (p - rates_str), "%02X ", network->rates[i]);
|
||||
p += snprintf(p,
|
||||
sizeof(rates_str) - (p -
|
||||
rates_str),
|
||||
"%02X ", network->rates[i]);
|
||||
#endif
|
||||
if (ieee80211_is_ofdm_rate(info_element->data[i])) {
|
||||
if (ieee80211_is_ofdm_rate
|
||||
(info_element->data[i])) {
|
||||
network->flags |= NETWORK_HAS_OFDM;
|
||||
if (info_element->data[i] &
|
||||
IEEE80211_BASIC_RATE_MASK)
|
||||
network->flags &=
|
||||
~NETWORK_HAS_CCK;
|
||||
~NETWORK_HAS_CCK;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -903,14 +898,14 @@ static inline int ieee80211_network_init(
|
|||
break;
|
||||
|
||||
case MFIE_TYPE_DS_SET:
|
||||
IEEE80211_DEBUG_SCAN("MFIE_TYPE_DS_SET: %d\n",
|
||||
IEEE80211_DEBUG_SCAN("MFIE_TYPE_DS_SET: %d\n",
|
||||
info_element->data[0]);
|
||||
if (stats->freq == IEEE80211_24GHZ_BAND)
|
||||
network->channel = info_element->data[0];
|
||||
break;
|
||||
|
||||
case MFIE_TYPE_FH_SET:
|
||||
IEEE80211_DEBUG_SCAN("MFIE_TYPE_FH_SET: ignored\n");
|
||||
case MFIE_TYPE_FH_SET:
|
||||
IEEE80211_DEBUG_SCAN("MFIE_TYPE_FH_SET: ignored\n");
|
||||
break;
|
||||
|
||||
case MFIE_TYPE_CF_SET:
|
||||
|
@ -932,13 +927,13 @@ static inline int ieee80211_network_init(
|
|||
case MFIE_TYPE_GENERIC:
|
||||
IEEE80211_DEBUG_SCAN("MFIE_TYPE_GENERIC: %d bytes\n",
|
||||
info_element->len);
|
||||
if (info_element->len >= 4 &&
|
||||
if (info_element->len >= 4 &&
|
||||
info_element->data[0] == 0x00 &&
|
||||
info_element->data[1] == 0x50 &&
|
||||
info_element->data[2] == 0xf2 &&
|
||||
info_element->data[3] == 0x01) {
|
||||
network->wpa_ie_len = min(info_element->len + 2,
|
||||
MAX_WPA_IE_LEN);
|
||||
MAX_WPA_IE_LEN);
|
||||
memcpy(network->wpa_ie, info_element,
|
||||
network->wpa_ie_len);
|
||||
}
|
||||
|
@ -948,7 +943,7 @@ static inline int ieee80211_network_init(
|
|||
IEEE80211_DEBUG_SCAN("MFIE_TYPE_RSN: %d bytes\n",
|
||||
info_element->len);
|
||||
network->rsn_ie_len = min(info_element->len + 2,
|
||||
MAX_WPA_IE_LEN);
|
||||
MAX_WPA_IE_LEN);
|
||||
memcpy(network->rsn_ie, info_element,
|
||||
network->rsn_ie_len);
|
||||
break;
|
||||
|
@ -956,14 +951,14 @@ static inline int ieee80211_network_init(
|
|||
default:
|
||||
IEEE80211_DEBUG_SCAN("unsupported IE %d\n",
|
||||
info_element->id);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
left -= sizeof(struct ieee80211_info_element_hdr) +
|
||||
info_element->len;
|
||||
info_element->len;
|
||||
info_element = (struct ieee80211_info_element *)
|
||||
&info_element->data[info_element->len];
|
||||
}
|
||||
&info_element->data[info_element->len];
|
||||
}
|
||||
|
||||
network->mode = 0;
|
||||
if (stats->freq == IEEE80211_52GHZ_BAND)
|
||||
|
@ -1032,10 +1027,13 @@ static inline void update_network(struct ieee80211_network *dst,
|
|||
/* dst->last_associate is not overwritten */
|
||||
}
|
||||
|
||||
static inline void ieee80211_process_probe_response(
|
||||
struct ieee80211_device *ieee,
|
||||
struct ieee80211_probe_response *beacon,
|
||||
struct ieee80211_rx_stats *stats)
|
||||
static inline void ieee80211_process_probe_response(struct ieee80211_device
|
||||
*ieee,
|
||||
struct
|
||||
ieee80211_probe_response
|
||||
*beacon,
|
||||
struct ieee80211_rx_stats
|
||||
*stats)
|
||||
{
|
||||
struct ieee80211_network network;
|
||||
struct ieee80211_network *target;
|
||||
|
@ -1045,33 +1043,35 @@ static inline void ieee80211_process_probe_response(
|
|||
#endif
|
||||
unsigned long flags;
|
||||
|
||||
IEEE80211_DEBUG_SCAN(
|
||||
"'%s' (" MAC_FMT "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
|
||||
escape_essid(info_element->data, info_element->len),
|
||||
MAC_ARG(beacon->header.addr3),
|
||||
(beacon->capability & (1<<0xf)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0xe)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0xd)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0xc)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0xb)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0xa)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x9)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x8)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x7)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x6)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x5)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x4)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x3)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x2)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x1)) ? '1' : '0',
|
||||
(beacon->capability & (1<<0x0)) ? '1' : '0');
|
||||
IEEE80211_DEBUG_SCAN("'%s' (" MAC_FMT
|
||||
"): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
|
||||
escape_essid(info_element->data,
|
||||
info_element->len),
|
||||
MAC_ARG(beacon->header.addr3),
|
||||
(beacon->capability & (1 << 0xf)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0xe)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0xd)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0xc)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0xb)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0xa)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x9)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x8)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x7)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x6)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x5)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x4)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x3)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x2)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x1)) ? '1' : '0',
|
||||
(beacon->capability & (1 << 0x0)) ? '1' : '0');
|
||||
|
||||
if (ieee80211_network_init(ieee, beacon, &network, stats)) {
|
||||
IEEE80211_DEBUG_SCAN("Dropped '%s' (" MAC_FMT ") via %s.\n",
|
||||
escape_essid(info_element->data,
|
||||
info_element->len),
|
||||
MAC_ARG(beacon->header.addr3),
|
||||
WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
|
||||
WLAN_FC_GET_STYPE(beacon->header.
|
||||
frame_ctl) ==
|
||||
IEEE80211_STYPE_PROBE_RESP ?
|
||||
"PROBE RESPONSE" : "BEACON");
|
||||
return;
|
||||
|
@ -1117,13 +1117,13 @@ static inline void ieee80211_process_probe_response(
|
|||
list_del(ieee->network_free_list.next);
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_IEEE80211_DEBUG
|
||||
IEEE80211_DEBUG_SCAN("Adding '%s' (" MAC_FMT ") via %s.\n",
|
||||
escape_essid(network.ssid,
|
||||
network.ssid_len),
|
||||
MAC_ARG(network.bssid),
|
||||
WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
|
||||
WLAN_FC_GET_STYPE(beacon->header.
|
||||
frame_ctl) ==
|
||||
IEEE80211_STYPE_PROBE_RESP ?
|
||||
"PROBE RESPONSE" : "BEACON");
|
||||
#endif
|
||||
|
@ -1134,7 +1134,8 @@ static inline void ieee80211_process_probe_response(
|
|||
escape_essid(target->ssid,
|
||||
target->ssid_len),
|
||||
MAC_ARG(target->bssid),
|
||||
WLAN_FC_GET_STYPE(beacon->header.frame_ctl) ==
|
||||
WLAN_FC_GET_STYPE(beacon->header.
|
||||
frame_ctl) ==
|
||||
IEEE80211_STYPE_PROBE_RESP ?
|
||||
"PROBE RESPONSE" : "BEACON");
|
||||
update_network(target, &network);
|
||||
|
@ -1162,16 +1163,20 @@ void ieee80211_rx_mgt(struct ieee80211_device *ieee,
|
|||
IEEE80211_DEBUG_MGMT("received PROBE RESPONSE (%d)\n",
|
||||
WLAN_FC_GET_STYPE(header->frame_ctl));
|
||||
IEEE80211_DEBUG_SCAN("Probe response\n");
|
||||
ieee80211_process_probe_response(
|
||||
ieee, (struct ieee80211_probe_response *)header, stats);
|
||||
ieee80211_process_probe_response(ieee,
|
||||
(struct
|
||||
ieee80211_probe_response *)
|
||||
header, stats);
|
||||
break;
|
||||
|
||||
case IEEE80211_STYPE_BEACON:
|
||||
IEEE80211_DEBUG_MGMT("received BEACON (%d)\n",
|
||||
WLAN_FC_GET_STYPE(header->frame_ctl));
|
||||
IEEE80211_DEBUG_SCAN("Beacon\n");
|
||||
ieee80211_process_probe_response(
|
||||
ieee, (struct ieee80211_probe_response *)header, stats);
|
||||
ieee80211_process_probe_response(ieee,
|
||||
(struct
|
||||
ieee80211_probe_response *)
|
||||
header, stats);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -1184,6 +1189,5 @@ void ieee80211_rx_mgt(struct ieee80211_device *ieee,
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
EXPORT_SYMBOL(ieee80211_rx_mgt);
|
||||
EXPORT_SYMBOL(ieee80211_rx);
|
||||
|
|
|
@ -45,10 +45,8 @@
|
|||
|
||||
#include <net/ieee80211.h>
|
||||
|
||||
|
||||
/*
|
||||
|
||||
|
||||
802.11 Data Frame
|
||||
|
||||
,-------------------------------------------------------------------.
|
||||
|
@ -82,7 +80,6 @@ Desc. | IV | Encrypted | ICV |
|
|||
`-----------------------'
|
||||
Total: 8 non-data bytes
|
||||
|
||||
|
||||
802.3 Ethernet Data Frame
|
||||
|
||||
,-----------------------------------------.
|
||||
|
@ -131,7 +128,7 @@ payload of each frame is reduced to 492 bytes.
|
|||
static u8 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 };
|
||||
static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 };
|
||||
|
||||
static inline int ieee80211_put_snap(u8 *data, u16 h_proto)
|
||||
static inline int ieee80211_put_snap(u8 * data, u16 h_proto)
|
||||
{
|
||||
struct ieee80211_snap_hdr *snap;
|
||||
u8 *oui;
|
||||
|
@ -149,17 +146,15 @@ static inline int ieee80211_put_snap(u8 *data, u16 h_proto)
|
|||
snap->oui[1] = oui[1];
|
||||
snap->oui[2] = oui[2];
|
||||
|
||||
*(u16 *)(data + SNAP_SIZE) = htons(h_proto);
|
||||
*(u16 *) (data + SNAP_SIZE) = htons(h_proto);
|
||||
|
||||
return SNAP_SIZE + sizeof(u16);
|
||||
}
|
||||
|
||||
static inline int ieee80211_encrypt_fragment(
|
||||
struct ieee80211_device *ieee,
|
||||
struct sk_buff *frag,
|
||||
int hdr_len)
|
||||
static inline int ieee80211_encrypt_fragment(struct ieee80211_device *ieee,
|
||||
struct sk_buff *frag, int hdr_len)
|
||||
{
|
||||
struct ieee80211_crypt_data* crypt = ieee->crypt[ieee->tx_keyidx];
|
||||
struct ieee80211_crypt_data *crypt = ieee->crypt[ieee->tx_keyidx];
|
||||
int res;
|
||||
|
||||
#ifdef CONFIG_IEEE80211_CRYPT_TKIP
|
||||
|
@ -167,7 +162,7 @@ static inline int ieee80211_encrypt_fragment(
|
|||
|
||||
if (ieee->tkip_countermeasures &&
|
||||
crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {
|
||||
header = (struct ieee80211_hdr *) frag->data;
|
||||
header = (struct ieee80211_hdr *)frag->data;
|
||||
if (net_ratelimit()) {
|
||||
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
|
||||
"TX packet to " MAC_FMT "\n",
|
||||
|
@ -200,8 +195,8 @@ static inline int ieee80211_encrypt_fragment(
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
void ieee80211_txb_free(struct ieee80211_txb *txb) {
|
||||
void ieee80211_txb_free(struct ieee80211_txb *txb)
|
||||
{
|
||||
int i;
|
||||
if (unlikely(!txb))
|
||||
return;
|
||||
|
@ -216,9 +211,8 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
|
|||
{
|
||||
struct ieee80211_txb *txb;
|
||||
int i;
|
||||
txb = kmalloc(
|
||||
sizeof(struct ieee80211_txb) + (sizeof(u8*) * nr_frags),
|
||||
gfp_mask);
|
||||
txb = kmalloc(sizeof(struct ieee80211_txb) + (sizeof(u8 *) * nr_frags),
|
||||
gfp_mask);
|
||||
if (!txb)
|
||||
return NULL;
|
||||
|
||||
|
@ -243,8 +237,7 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
|
|||
}
|
||||
|
||||
/* SKBs are added to the ieee->tx_queue. */
|
||||
int ieee80211_xmit(struct sk_buff *skb,
|
||||
struct net_device *dev)
|
||||
int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct ieee80211_device *ieee = netdev_priv(dev);
|
||||
struct ieee80211_txb *txb = NULL;
|
||||
|
@ -255,21 +248,20 @@ int ieee80211_xmit(struct sk_buff *skb,
|
|||
int ether_type, encrypt;
|
||||
int bytes, fc, hdr_len;
|
||||
struct sk_buff *skb_frag;
|
||||
struct ieee80211_hdr header = { /* Ensure zero initialized */
|
||||
struct ieee80211_hdr header = { /* Ensure zero initialized */
|
||||
.duration_id = 0,
|
||||
.seq_ctl = 0
|
||||
};
|
||||
u8 dest[ETH_ALEN], src[ETH_ALEN];
|
||||
|
||||
struct ieee80211_crypt_data* crypt;
|
||||
struct ieee80211_crypt_data *crypt;
|
||||
|
||||
spin_lock_irqsave(&ieee->lock, flags);
|
||||
|
||||
/* If there is no driver handler to take the TXB, dont' bother
|
||||
* creating it... */
|
||||
if (!ieee->hard_start_xmit) {
|
||||
printk(KERN_WARNING "%s: No xmit handler.\n",
|
||||
ieee->dev->name);
|
||||
printk(KERN_WARNING "%s: No xmit handler.\n", ieee->dev->name);
|
||||
goto success;
|
||||
}
|
||||
|
||||
|
@ -284,7 +276,7 @@ int ieee80211_xmit(struct sk_buff *skb,
|
|||
crypt = ieee->crypt[ieee->tx_keyidx];
|
||||
|
||||
encrypt = !(ether_type == ETH_P_PAE && ieee->ieee802_1x) &&
|
||||
ieee->host_encrypt && crypt && crypt->ops;
|
||||
ieee->host_encrypt && crypt && crypt->ops;
|
||||
|
||||
if (!encrypt && ieee->ieee802_1x &&
|
||||
ieee->drop_unencrypted && ether_type != ETH_P_PAE) {
|
||||
|
@ -294,7 +286,7 @@ int ieee80211_xmit(struct sk_buff *skb,
|
|||
|
||||
/* Save source and destination addresses */
|
||||
memcpy(&dest, skb->data, ETH_ALEN);
|
||||
memcpy(&src, skb->data+ETH_ALEN, ETH_ALEN);
|
||||
memcpy(&src, skb->data + ETH_ALEN, ETH_ALEN);
|
||||
|
||||
/* Advance the SKB to the start of the payload */
|
||||
skb_pull(skb, sizeof(struct ethhdr));
|
||||
|
@ -304,7 +296,7 @@ int ieee80211_xmit(struct sk_buff *skb,
|
|||
|
||||
if (encrypt)
|
||||
fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
|
||||
IEEE80211_FCTL_PROTECTED;
|
||||
IEEE80211_FCTL_PROTECTED;
|
||||
else
|
||||
fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;
|
||||
|
||||
|
@ -327,8 +319,7 @@ int ieee80211_xmit(struct sk_buff *skb,
|
|||
|
||||
/* Determine fragmentation size based on destination (multicast
|
||||
* and broadcast are not fragmented) */
|
||||
if (is_multicast_ether_addr(dest) ||
|
||||
is_broadcast_ether_addr(dest))
|
||||
if (is_multicast_ether_addr(dest) || is_broadcast_ether_addr(dest))
|
||||
frag_size = MAX_FRAG_THRESHOLD;
|
||||
else
|
||||
frag_size = ieee->fts;
|
||||
|
@ -345,7 +336,7 @@ int ieee80211_xmit(struct sk_buff *skb,
|
|||
/* Each fragment may need to have room for encryptiong pre/postfix */
|
||||
if (encrypt)
|
||||
bytes_per_frag -= crypt->ops->extra_prefix_len +
|
||||
crypt->ops->extra_postfix_len;
|
||||
crypt->ops->extra_postfix_len;
|
||||
|
||||
/* Number of fragments is the total bytes_per_frag /
|
||||
* payload_per_fragment */
|
||||
|
@ -380,19 +371,19 @@ int ieee80211_xmit(struct sk_buff *skb,
|
|||
/* If this is not the last fragment, then add the MOREFRAGS
|
||||
* bit to the frame control */
|
||||
if (i != nr_frags - 1) {
|
||||
frag_hdr->frame_ctl = cpu_to_le16(
|
||||
fc | IEEE80211_FCTL_MOREFRAGS);
|
||||
frag_hdr->frame_ctl =
|
||||
cpu_to_le16(fc | IEEE80211_FCTL_MOREFRAGS);
|
||||
bytes = bytes_per_frag;
|
||||
} else {
|
||||
/* The last fragment takes the remaining length */
|
||||
bytes = bytes_last_frag;
|
||||
}
|
||||
|
||||
/* Put a SNAP header on the first fragment */
|
||||
/* Put a SNAP header on the first fragment */
|
||||
if (i == 0) {
|
||||
ieee80211_put_snap(
|
||||
skb_put(skb_frag, SNAP_SIZE + sizeof(u16)),
|
||||
ether_type);
|
||||
ieee80211_put_snap(skb_put
|
||||
(skb_frag, SNAP_SIZE + sizeof(u16)),
|
||||
ether_type);
|
||||
bytes -= SNAP_SIZE + sizeof(u16);
|
||||
}
|
||||
|
||||
|
@ -410,14 +401,13 @@ int ieee80211_xmit(struct sk_buff *skb,
|
|||
skb_put(skb_frag, 4);
|
||||
}
|
||||
|
||||
|
||||
success:
|
||||
success:
|
||||
spin_unlock_irqrestore(&ieee->lock, flags);
|
||||
|
||||
dev_kfree_skb_any(skb);
|
||||
|
||||
if (txb) {
|
||||
if ((*ieee->hard_start_xmit)(txb, dev) == 0) {
|
||||
if ((*ieee->hard_start_xmit) (txb, dev) == 0) {
|
||||
stats->tx_packets++;
|
||||
stats->tx_bytes += txb->payload_size;
|
||||
return 0;
|
||||
|
@ -427,7 +417,7 @@ int ieee80211_xmit(struct sk_buff *skb,
|
|||
|
||||
return 0;
|
||||
|
||||
failed:
|
||||
failed:
|
||||
spin_unlock_irqrestore(&ieee->lock, flags);
|
||||
netif_stop_queue(dev);
|
||||
stats->tx_errors++;
|
||||
|
|
|
@ -42,7 +42,7 @@ static const char *ieee80211_modes[] = {
|
|||
|
||||
#define MAX_CUSTOM_LEN 64
|
||||
static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
|
||||
char *start, char *stop,
|
||||
char *start, char *stop,
|
||||
struct ieee80211_network *network)
|
||||
{
|
||||
char custom[MAX_CUSTOM_LEN];
|
||||
|
@ -66,29 +66,28 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
|
|||
iwe.u.data.length = sizeof("<hidden>");
|
||||
start = iwe_stream_add_point(start, stop, &iwe, "<hidden>");
|
||||
} else {
|
||||
iwe.u.data.length = min(network->ssid_len, (u8)32);
|
||||
iwe.u.data.length = min(network->ssid_len, (u8) 32);
|
||||
start = iwe_stream_add_point(start, stop, &iwe, network->ssid);
|
||||
}
|
||||
|
||||
/* Add the protocol name */
|
||||
iwe.cmd = SIOCGIWNAME;
|
||||
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11%s", ieee80211_modes[network->mode]);
|
||||
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11%s",
|
||||
ieee80211_modes[network->mode]);
|
||||
start = iwe_stream_add_event(start, stop, &iwe, IW_EV_CHAR_LEN);
|
||||
|
||||
/* Add mode */
|
||||
iwe.cmd = SIOCGIWMODE;
|
||||
if (network->capability &
|
||||
(WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
|
||||
/* Add mode */
|
||||
iwe.cmd = SIOCGIWMODE;
|
||||
if (network->capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
|
||||
if (network->capability & WLAN_CAPABILITY_ESS)
|
||||
iwe.u.mode = IW_MODE_MASTER;
|
||||
else
|
||||
iwe.u.mode = IW_MODE_ADHOC;
|
||||
|
||||
start = iwe_stream_add_event(start, stop, &iwe,
|
||||
IW_EV_UINT_LEN);
|
||||
start = iwe_stream_add_event(start, stop, &iwe, IW_EV_UINT_LEN);
|
||||
}
|
||||
|
||||
/* Add frequency/channel */
|
||||
/* Add frequency/channel */
|
||||
iwe.cmd = SIOCGIWFREQ;
|
||||
/* iwe.u.freq.m = ieee80211_frequency(network->channel, network->mode);
|
||||
iwe.u.freq.e = 3; */
|
||||
|
@ -110,7 +109,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
|
|||
max_rate = 0;
|
||||
p = custom;
|
||||
p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), " Rates (Mb/s): ");
|
||||
for (i = 0, j = 0; i < network->rates_len; ) {
|
||||
for (i = 0, j = 0; i < network->rates_len;) {
|
||||
if (j < network->rates_ex_len &&
|
||||
((network->rates_ex[j] & 0x7F) <
|
||||
(network->rates[i] & 0x7F)))
|
||||
|
@ -133,8 +132,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
|
|||
iwe.cmd = SIOCGIWRATE;
|
||||
iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
|
||||
iwe.u.bitrate.value = max_rate * 500000;
|
||||
start = iwe_stream_add_event(start, stop, &iwe,
|
||||
IW_EV_PARAM_LEN);
|
||||
start = iwe_stream_add_event(start, stop, &iwe, IW_EV_PARAM_LEN);
|
||||
|
||||
iwe.cmd = IWEVCUSTOM;
|
||||
iwe.u.data.length = p - custom;
|
||||
|
@ -164,7 +162,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
|
|||
if (iwe.u.data.length)
|
||||
start = iwe_stream_add_point(start, stop, &iwe, custom);
|
||||
|
||||
if (ieee->wpa_enabled && network->wpa_ie_len){
|
||||
if (ieee->wpa_enabled && network->wpa_ie_len) {
|
||||
char buf[MAX_WPA_IE_LEN * 2 + 30];
|
||||
|
||||
u8 *p = buf;
|
||||
|
@ -179,7 +177,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
|
|||
start = iwe_stream_add_point(start, stop, &iwe, buf);
|
||||
}
|
||||
|
||||
if (ieee->wpa_enabled && network->rsn_ie_len){
|
||||
if (ieee->wpa_enabled && network->rsn_ie_len) {
|
||||
char buf[MAX_WPA_IE_LEN * 2 + 30];
|
||||
|
||||
u8 *p = buf;
|
||||
|
@ -199,12 +197,12 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
|
|||
iwe.cmd = IWEVCUSTOM;
|
||||
p = custom;
|
||||
p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
|
||||
" Last beacon: %lums ago", (jiffies - network->last_scanned) / (HZ / 100));
|
||||
" Last beacon: %lums ago",
|
||||
(jiffies - network->last_scanned) / (HZ / 100));
|
||||
iwe.u.data.length = p - custom;
|
||||
if (iwe.u.data.length)
|
||||
start = iwe_stream_add_point(start, stop, &iwe, custom);
|
||||
|
||||
|
||||
return start;
|
||||
}
|
||||
|
||||
|
@ -229,18 +227,19 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
|
|||
time_after(network->last_scanned + ieee->scan_age, jiffies))
|
||||
ev = ipw2100_translate_scan(ieee, ev, stop, network);
|
||||
else
|
||||
IEEE80211_DEBUG_SCAN(
|
||||
"Not showing network '%s ("
|
||||
MAC_FMT ")' due to age (%lums).\n",
|
||||
escape_essid(network->ssid,
|
||||
network->ssid_len),
|
||||
MAC_ARG(network->bssid),
|
||||
(jiffies - network->last_scanned) / (HZ / 100));
|
||||
IEEE80211_DEBUG_SCAN("Not showing network '%s ("
|
||||
MAC_FMT ")' due to age (%lums).\n",
|
||||
escape_essid(network->ssid,
|
||||
network->ssid_len),
|
||||
MAC_ARG(network->bssid),
|
||||
(jiffies -
|
||||
network->last_scanned) / (HZ /
|
||||
100));
|
||||
}
|
||||
|
||||
spin_unlock_irqrestore(&ieee->lock, flags);
|
||||
|
||||
wrqu->data.length = ev - extra;
|
||||
wrqu->data.length = ev - extra;
|
||||
wrqu->data.flags = 0;
|
||||
|
||||
IEEE80211_DEBUG_WX("exit: %d networks returned.\n", i);
|
||||
|
@ -292,8 +291,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
|
|||
if (ieee->crypt[i] != NULL) {
|
||||
if (key_provided)
|
||||
break;
|
||||
ieee80211_crypt_delayed_deinit(
|
||||
ieee, &ieee->crypt[i]);
|
||||
ieee80211_crypt_delayed_deinit(ieee,
|
||||
&ieee->crypt[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -306,8 +305,6 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
|
|||
goto done;
|
||||
}
|
||||
|
||||
|
||||
|
||||
sec.enabled = 1;
|
||||
sec.flags |= SEC_ENABLED;
|
||||
|
||||
|
@ -341,8 +338,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
|
|||
new_crypt = NULL;
|
||||
|
||||
printk(KERN_WARNING "%s: could not initialize WEP: "
|
||||
"load module ieee80211_crypt_wep\n",
|
||||
dev->name);
|
||||
"load module ieee80211_crypt_wep\n", dev->name);
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
*crypt = new_crypt;
|
||||
|
@ -359,7 +355,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
|
|||
key, escape_essid(sec.keys[key], len),
|
||||
erq->length, len);
|
||||
sec.key_sizes[key] = len;
|
||||
(*crypt)->ops->set_key(sec.keys[key], len, NULL,
|
||||
(*crypt)->ops->set_key(sec.keys[key], len, NULL,
|
||||
(*crypt)->priv);
|
||||
sec.flags |= (1 << key);
|
||||
/* This ensures a key will be activated if no key is
|
||||
|
@ -382,15 +378,15 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
|
|||
|
||||
/* No key data - just set the default TX key index */
|
||||
if (key_provided) {
|
||||
IEEE80211_DEBUG_WX(
|
||||
"Setting key %d to default Tx key.\n", key);
|
||||
IEEE80211_DEBUG_WX
|
||||
("Setting key %d to default Tx key.\n", key);
|
||||
ieee->tx_keyidx = key;
|
||||
sec.active_key = key;
|
||||
sec.flags |= SEC_ACTIVE_KEY;
|
||||
}
|
||||
}
|
||||
|
||||
done:
|
||||
done:
|
||||
ieee->open_wep = !(erq->flags & IW_ENCODE_RESTRICTED);
|
||||
sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;
|
||||
sec.flags |= SEC_AUTH_MODE;
|
||||
|
@ -400,7 +396,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
|
|||
/* For now we just support WEP, so only set that security level...
|
||||
* TODO: When WPA is added this is one place that needs to change */
|
||||
sec.flags |= SEC_LEVEL;
|
||||
sec.level = SEC_LEVEL_1; /* 40 and 104 bit WEP */
|
||||
sec.level = SEC_LEVEL_1; /* 40 and 104 bit WEP */
|
||||
|
||||
if (ieee->set_security)
|
||||
ieee->set_security(dev, &sec);
|
||||
|
|
Loading…
Reference in a new issue