Skip to content

L
linux
Commit 0edd5b44 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

[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.
parent bbeec90b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1648 additions and 1749 deletions
drivers/net/wireless/ipw2200.c
View file @ 0edd5b44
This source diff could not be displayed because it is too large. You can view the blob instead.
drivers/net/wireless/ipw2200.h
View file @ 0edd5b44
This diff is collapsed.
net/ieee80211/ieee80211_crypt.c
View file @ 0edd5b44
...@@ -30,7 +30,6 @@ struct ieee80211_crypto_alg { ...@@ -30,7 +30,6 @@ struct ieee80211_crypto_alg {
struct ieee80211_crypto_ops *ops; struct ieee80211_crypto_ops *ops;
}; };
struct ieee80211_crypto { struct ieee80211_crypto {
struct list_head algs; struct list_head algs;
spinlock_t lock; spinlock_t lock;
...@@ -38,8 +37,7 @@ struct ieee80211_crypto { ...@@ -38,8 +37,7 @@ struct ieee80211_crypto {
static struct ieee80211_crypto *hcrypt; static struct ieee80211_crypto *hcrypt;
void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, void ieee80211_crypt_deinit_entries(struct ieee80211_device *ieee, int force)
int force)
{ {
struct list_head *ptr, *n; struct list_head *ptr, *n;
struct ieee80211_crypt_data *entry; struct ieee80211_crypt_data *entry;
...@@ -140,7 +138,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops) ...@@ -140,7 +138,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
spin_lock_irqsave(&hcrypt->lock, flags); spin_lock_irqsave(&hcrypt->lock, flags);
for (ptr = hcrypt->algs.next; ptr != &hcrypt->algs; ptr = ptr->next) { for (ptr = hcrypt->algs.next; ptr != &hcrypt->algs; ptr = ptr->next) {
struct ieee80211_crypto_alg *alg = struct ieee80211_crypto_alg *alg =
(struct ieee80211_crypto_alg *) ptr; (struct ieee80211_crypto_alg *)ptr;
if (alg->ops == ops) { if (alg->ops == ops) {
list_del(&alg->list); list_del(&alg->list);
del_alg = alg; del_alg = alg;
...@@ -158,8 +156,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops) ...@@ -158,8 +156,7 @@ int ieee80211_unregister_crypto_ops(struct ieee80211_crypto_ops *ops)
return del_alg ? 0 : -1; 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; unsigned long flags;
struct list_head *ptr; struct list_head *ptr;
...@@ -171,7 +168,7 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name) ...@@ -171,7 +168,7 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
spin_lock_irqsave(&hcrypt->lock, flags); spin_lock_irqsave(&hcrypt->lock, flags);
for (ptr = hcrypt->algs.next; ptr != &hcrypt->algs; ptr = ptr->next) { for (ptr = hcrypt->algs.next; ptr != &hcrypt->algs; ptr = ptr->next) {
struct ieee80211_crypto_alg *alg = struct ieee80211_crypto_alg *alg =
(struct ieee80211_crypto_alg *) ptr; (struct ieee80211_crypto_alg *)ptr;
if (strcmp(alg->ops->name, name) == 0) { if (strcmp(alg->ops->name, name) == 0) {
found_alg = alg; found_alg = alg;
break; break;
...@@ -185,9 +182,13 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name) ...@@ -185,9 +182,13 @@ struct ieee80211_crypto_ops * ieee80211_get_crypto_ops(const char *name)
return NULL; return NULL;
} }
static void *ieee80211_crypt_null_init(int keyidx)
static void * ieee80211_crypt_null_init(int keyidx) { return (void *) 1; } {
static void ieee80211_crypt_null_deinit(void *priv) {} return (void *)1;
}
static void ieee80211_crypt_null_deinit(void *priv)
{
}
static struct ieee80211_crypto_ops ieee80211_crypt_null = { static struct ieee80211_crypto_ops ieee80211_crypt_null = {
.name = "NULL", .name = "NULL",
...@@ -204,7 +205,6 @@ static struct ieee80211_crypto_ops ieee80211_crypt_null = { ...@@ -204,7 +205,6 @@ static struct ieee80211_crypto_ops ieee80211_crypt_null = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __init ieee80211_crypto_init(void) static int __init ieee80211_crypto_init(void)
{ {
int ret = -ENOMEM; int ret = -ENOMEM;
...@@ -222,11 +222,10 @@ static int __init ieee80211_crypto_init(void) ...@@ -222,11 +222,10 @@ static int __init ieee80211_crypto_init(void)
kfree(hcrypt); kfree(hcrypt);
hcrypt = NULL; hcrypt = NULL;
} }
out: out:
return ret; return ret;
} }
static void __exit ieee80211_crypto_deinit(void) static void __exit ieee80211_crypto_deinit(void)
{ {
struct list_head *ptr, *n; struct list_head *ptr, *n;
...@@ -237,7 +236,7 @@ static void __exit ieee80211_crypto_deinit(void) ...@@ -237,7 +236,7 @@ static void __exit ieee80211_crypto_deinit(void)
for (ptr = hcrypt->algs.next, n = ptr->next; ptr != &hcrypt->algs; for (ptr = hcrypt->algs.next, n = ptr->next; ptr != &hcrypt->algs;
ptr = n, n = ptr->next) { ptr = n, n = ptr->next) {
struct ieee80211_crypto_alg *alg = struct ieee80211_crypto_alg *alg =
(struct ieee80211_crypto_alg *) ptr; (struct ieee80211_crypto_alg *)ptr;
list_del(ptr); list_del(ptr);
printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm " printk(KERN_DEBUG "ieee80211_crypt: unregistered algorithm "
"'%s' (deinit)\n", alg->ops->name); "'%s' (deinit)\n", alg->ops->name);
......
net/ieee80211/ieee80211_crypt_ccmp.c
View file @ 0edd5b44
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
...@@ -55,7 +54,7 @@ struct ieee80211_ccmp_data { ...@@ -55,7 +54,7 @@ struct ieee80211_ccmp_data {
/* scratch buffers for virt_to_page() (crypto API) */ /* scratch buffers for virt_to_page() (crypto API) */
u8 tx_b0[AES_BLOCK_LEN], tx_b[AES_BLOCK_LEN], 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]; 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, ...@@ -75,7 +74,7 @@ static void ieee80211_ccmp_aes_encrypt(struct crypto_tfm *tfm,
crypto_cipher_encrypt(tfm, &dst, &src, AES_BLOCK_LEN); 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; struct ieee80211_ccmp_data *priv;
...@@ -94,7 +93,7 @@ static void * ieee80211_ccmp_init(int key_idx) ...@@ -94,7 +93,7 @@ static void * ieee80211_ccmp_init(int key_idx)
return priv; return priv;
fail: fail:
if (priv) { if (priv) {
if (priv->tfm) if (priv->tfm)
crypto_free_tfm(priv->tfm); crypto_free_tfm(priv->tfm);
...@@ -104,7 +103,6 @@ static void * ieee80211_ccmp_init(int key_idx) ...@@ -104,7 +103,6 @@ static void * ieee80211_ccmp_init(int key_idx)
return NULL; return NULL;
} }
static void ieee80211_ccmp_deinit(void *priv) static void ieee80211_ccmp_deinit(void *priv)
{ {
struct ieee80211_ccmp_data *_priv = priv; struct ieee80211_ccmp_data *_priv = priv;
...@@ -113,19 +111,16 @@ static void ieee80211_ccmp_deinit(void *priv) ...@@ -113,19 +111,16 @@ static void ieee80211_ccmp_deinit(void *priv)
kfree(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; int i;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
b[i] ^= a[i]; b[i] ^= a[i];
} }
static void ccmp_init_blocks(struct crypto_tfm *tfm, static void ccmp_init_blocks(struct crypto_tfm *tfm,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
u8 *pn, size_t dlen, u8 *b0, u8 *auth, u8 * pn, size_t dlen, u8 * b0, u8 * auth, u8 * s0)
u8 *s0)
{ {
u8 *pos, qc = 0; u8 *pos, qc = 0;
size_t aad_len; size_t aad_len;
...@@ -142,7 +137,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, ...@@ -142,7 +137,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
if (a4_included) if (a4_included)
aad_len += 6; aad_len += 6;
if (qc_included) { if (qc_included) {
pos = (u8 *) &hdr->addr4; pos = (u8 *) & hdr->addr4;
if (a4_included) if (a4_included)
pos += 6; pos += 6;
qc = *pos & 0x0f; qc = *pos & 0x0f;
...@@ -169,14 +164,14 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, ...@@ -169,14 +164,14 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
* QC (if present) * QC (if present)
*/ */
pos = (u8 *) hdr; pos = (u8 *) hdr;
aad[0] = 0; /* aad_len >> 8 */ aad[0] = 0; /* aad_len >> 8 */
aad[1] = aad_len & 0xff; aad[1] = aad_len & 0xff;
aad[2] = pos[0] & 0x8f; aad[2] = pos[0] & 0x8f;
aad[3] = pos[1] & 0xc7; aad[3] = pos[1] & 0xc7;
memcpy(aad + 4, hdr->addr1, 3 * ETH_ALEN); memcpy(aad + 4, hdr->addr1, 3 * ETH_ALEN);
pos = (u8 *) &hdr->seq_ctl; pos = (u8 *) & hdr->seq_ctl;
aad[22] = pos[0] & 0x0f; aad[22] = pos[0] & 0x0f;
aad[23] = 0; /* all bits masked */ aad[23] = 0; /* all bits masked */
memset(aad + 24, 0, 8); memset(aad + 24, 0, 8);
if (a4_included) if (a4_included)
memcpy(aad + 24, hdr->addr4, ETH_ALEN); memcpy(aad + 24, hdr->addr4, ETH_ALEN);
...@@ -196,7 +191,6 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, ...@@ -196,7 +191,6 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm,
ieee80211_ccmp_aes_encrypt(tfm, b0, s0); ieee80211_ccmp_aes_encrypt(tfm, b0, s0);
} }
static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
{ {
struct ieee80211_ccmp_data *key = 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) ...@@ -209,8 +203,7 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
u8 *s0 = key->tx_s0; u8 *s0 = key->tx_s0;
if (skb_headroom(skb) < CCMP_HDR_LEN || if (skb_headroom(skb) < CCMP_HDR_LEN ||
skb_tailroom(skb) < CCMP_MIC_LEN || skb_tailroom(skb) < CCMP_MIC_LEN || skb->len < hdr_len)
skb->len < hdr_len)
return -1; return -1;
data_len = skb->len - hdr_len; data_len = skb->len - hdr_len;
...@@ -230,13 +223,13 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -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[5];
*pos++ = key->tx_pn[4]; *pos++ = key->tx_pn[4];
*pos++ = 0; *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[3];
*pos++ = key->tx_pn[2]; *pos++ = key->tx_pn[2];
*pos++ = key->tx_pn[1]; *pos++ = key->tx_pn[1];
*pos++ = key->tx_pn[0]; *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); ccmp_init_blocks(key->tfm, hdr, key->tx_pn, data_len, b0, b, s0);
blocks = (data_len + AES_BLOCK_LEN - 1) / AES_BLOCK_LEN; 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) ...@@ -261,7 +254,6 @@ static int ieee80211_ccmp_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
return 0; return 0;
} }
static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
{ {
struct ieee80211_ccmp_data *key = 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) ...@@ -280,7 +272,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return -1; return -1;
} }
hdr = (struct ieee80211_hdr *) skb->data; hdr = (struct ieee80211_hdr *)skb->data;
pos = skb->data + hdr_len; pos = skb->data + hdr_len;
keyidx = pos[3]; keyidx = pos[3];
if (!(keyidx & (1 << 5))) { if (!(keyidx & (1 << 5))) {
...@@ -364,8 +356,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv) ...@@ -364,8 +356,7 @@ static int ieee80211_ccmp_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return keyidx; 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; struct ieee80211_ccmp_data *data = priv;
int keyidx; int keyidx;
...@@ -395,8 +386,7 @@ static int ieee80211_ccmp_set_key(void *key, int len, u8 *seq, void *priv) ...@@ -395,8 +386,7 @@ static int ieee80211_ccmp_set_key(void *key, int len, u8 *seq, void *priv)
return 0; 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; struct ieee80211_ccmp_data *data = priv;
...@@ -419,8 +409,7 @@ static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv) ...@@ -419,8 +409,7 @@ static int ieee80211_ccmp_get_key(void *key, int len, u8 *seq, void *priv)
return CCMP_TK_LEN; 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; struct ieee80211_ccmp_data *ccmp = priv;
p += sprintf(p, "key[%d] alg=CCMP key_set=%d " p += sprintf(p, "key[%d] alg=CCMP key_set=%d "
...@@ -436,7 +425,6 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv) ...@@ -436,7 +425,6 @@ static char * ieee80211_ccmp_print_stats(char *p, void *priv)
return p; return p;
} }
static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = { static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
.name = "CCMP", .name = "CCMP",
.init = ieee80211_ccmp_init, .init = ieee80211_ccmp_init,
...@@ -453,18 +441,15 @@ static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = { ...@@ -453,18 +441,15 @@ static struct ieee80211_crypto_ops ieee80211_crypt_ccmp = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __init ieee80211_crypto_ccmp_init(void) static int __init ieee80211_crypto_ccmp_init(void)
{ {
return ieee80211_register_crypto_ops(&ieee80211_crypt_ccmp); return ieee80211_register_crypto_ops(&ieee80211_crypt_ccmp);
} }
static void __exit ieee80211_crypto_ccmp_exit(void) static void __exit ieee80211_crypto_ccmp_exit(void)
{ {
ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp); ieee80211_unregister_crypto_ops(&ieee80211_crypt_ccmp);
} }
module_init(ieee80211_crypto_ccmp_init); module_init(ieee80211_crypto_ccmp_init);
module_exit(ieee80211_crypto_ccmp_exit); module_exit(ieee80211_crypto_ccmp_exit);
net/ieee80211/ieee80211_crypt_tkip.c
View file @ 0edd5b44
This diff is collapsed.
net/ieee80211/ieee80211_crypt_wep.c
View file @ 0edd5b44
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
#include <linux/crypto.h> #include <linux/crypto.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
#include <linux/crc32.h> #include <linux/crc32.h>
...@@ -29,7 +28,6 @@ MODULE_AUTHOR("Jouni Malinen"); ...@@ -29,7 +28,6 @@ MODULE_AUTHOR("Jouni Malinen");
MODULE_DESCRIPTION("Host AP crypt: WEP"); MODULE_DESCRIPTION("Host AP crypt: WEP");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
struct prism2_wep_data { struct prism2_wep_data {
u32 iv; u32 iv;
#define WEP_KEY_LEN 13 #define WEP_KEY_LEN 13
...@@ -39,8 +37,7 @@ struct prism2_wep_data { ...@@ -39,8 +37,7 @@ struct prism2_wep_data {
struct crypto_tfm *tfm; struct crypto_tfm *tfm;
}; };
static void *prism2_wep_init(int keyidx)
static void * prism2_wep_init(int keyidx)
{ {
struct prism2_wep_data *priv; struct prism2_wep_data *priv;
...@@ -62,7 +59,7 @@ static void * prism2_wep_init(int keyidx) ...@@ -62,7 +59,7 @@ static void * prism2_wep_init(int keyidx)
return priv; return priv;
fail: fail:
if (priv) { if (priv) {
if (priv->tfm) if (priv->tfm)
crypto_free_tfm(priv->tfm); crypto_free_tfm(priv->tfm);
...@@ -71,7 +68,6 @@ static void * prism2_wep_init(int keyidx) ...@@ -71,7 +68,6 @@ static void * prism2_wep_init(int keyidx)
return NULL; return NULL;
} }
static void prism2_wep_deinit(void *priv) static void prism2_wep_deinit(void *priv)
{ {
struct prism2_wep_data *_priv = priv; struct prism2_wep_data *_priv = priv;
...@@ -80,7 +76,6 @@ static void prism2_wep_deinit(void *priv) ...@@ -80,7 +76,6 @@ static void prism2_wep_deinit(void *priv)
kfree(priv); kfree(priv);
} }
/* Perform WEP encryption on given skb that has at least 4 bytes of headroom /* 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, * for IV and 4 bytes of tailroom for ICV. Both IV and ICV will be transmitted,
* so the payload length increases with 8 bytes. * 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) ...@@ -143,7 +138,6 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
return 0; return 0;
} }
/* Perform WEP decryption on given buffer. Buffer includes whole WEP part of /* Perform WEP decryption on given buffer. Buffer includes whole WEP part of
* the frame: IV (4 bytes), encrypted payload (including SNAP header), * the frame: IV (4 bytes), encrypted payload (including SNAP header),
* ICV (4 bytes). len includes both IV and ICV. * 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) ...@@ -202,8 +196,7 @@ static int prism2_wep_decrypt(struct sk_buff *skb, int hdr_len, void *priv)
return 0; 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; struct prism2_wep_data *wep = priv;
...@@ -216,8 +209,7 @@ static int prism2_wep_set_key(void *key, int len, u8 *seq, void *priv) ...@@ -216,8 +209,7 @@ static int prism2_wep_set_key(void *key, int len, u8 *seq, void *priv)
return 0; 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; struct prism2_wep_data *wep = priv;
...@@ -229,16 +221,13 @@ static int prism2_wep_get_key(void *key, int len, u8 *seq, void *priv) ...@@ -229,16 +221,13 @@ static int prism2_wep_get_key(void *key, int len, u8 *seq, void *priv)
return wep->key_len; 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; struct prism2_wep_data *wep = priv;
p += sprintf(p, "key[%d] alg=WEP len=%d\n", p += sprintf(p, "key[%d] alg=WEP len=%d\n", wep->key_idx, wep->key_len);
wep->key_idx, wep->key_len);
return p; return p;
} }
static struct ieee80211_crypto_ops ieee80211_crypt_wep = { static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
.name = "WEP", .name = "WEP",
.init = prism2_wep_init, .init = prism2_wep_init,
...@@ -250,23 +239,20 @@ static struct ieee80211_crypto_ops ieee80211_crypt_wep = { ...@@ -250,23 +239,20 @@ static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
.set_key = prism2_wep_set_key, .set_key = prism2_wep_set_key,
.get_key = prism2_wep_get_key, .get_key = prism2_wep_get_key,
.print_stats = prism2_wep_print_stats, .print_stats = prism2_wep_print_stats,
.extra_prefix_len = 4, /* IV */ .extra_prefix_len = 4, /* IV */
.extra_postfix_len = 4, /* ICV */ .extra_postfix_len = 4, /* ICV */
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int __init ieee80211_crypto_wep_init(void) static int __init ieee80211_crypto_wep_init(void)
{ {
return ieee80211_register_crypto_ops(&ieee80211_crypt_wep); return ieee80211_register_crypto_ops(&ieee80211_crypt_wep);
} }
static void __exit ieee80211_crypto_wep_exit(void) static void __exit ieee80211_crypto_wep_exit(void)
{ {
ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep); ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep);
} }
module_init(ieee80211_crypto_wep_init); module_init(ieee80211_crypto_wep_init);
module_exit(ieee80211_crypto_wep_exit); module_exit(ieee80211_crypto_wep_exit);
net/ieee80211/ieee80211_module.c
View file @ 0edd5b44
...@@ -54,7 +54,8 @@ ...@@ -54,7 +54,8 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
MODULE_DESCRIPTION("802.11 data/management/control stack"); 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"); MODULE_LICENSE("GPL");
#define DRV_NAME "ieee80211" #define DRV_NAME "ieee80211"
...@@ -64,9 +65,9 @@ static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee) ...@@ -64,9 +65,9 @@ static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
if (ieee->networks) if (ieee->networks)
return 0; return 0;
ieee->networks = kmalloc( ieee->networks =
MAX_NETWORK_COUNT * sizeof(struct ieee80211_network), kmalloc(MAX_NETWORK_COUNT * sizeof(struct ieee80211_network),
GFP_KERNEL); GFP_KERNEL);
if (!ieee->networks) { if (!ieee->networks) {
printk(KERN_WARNING "%s: Out of memory allocating beacons\n", printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
ieee->dev->name); ieee->dev->name);
...@@ -94,10 +95,10 @@ static inline void ieee80211_networks_initialize(struct ieee80211_device *ieee) ...@@ -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_free_list);
INIT_LIST_HEAD(&ieee->network_list); INIT_LIST_HEAD(&ieee->network_list);
for (i = 0; i < MAX_NETWORK_COUNT; i++) 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 net_device *alloc_ieee80211(int sizeof_priv)
{ {
struct ieee80211_device *ieee; struct ieee80211_device *ieee;
...@@ -118,8 +119,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv) ...@@ -118,8 +119,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
err = ieee80211_networks_allocate(ieee); err = ieee80211_networks_allocate(ieee);
if (err) { if (err) {
IEEE80211_ERROR("Unable to allocate beacon storage: %d\n", IEEE80211_ERROR("Unable to allocate beacon storage: %d\n", err);
err);
goto failed; goto failed;
} }
ieee80211_networks_initialize(ieee); ieee80211_networks_initialize(ieee);
...@@ -132,7 +132,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv) ...@@ -132,7 +132,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
/* Default to enabling full open WEP with host based encrypt/decrypt */ /* Default to enabling full open WEP with host based encrypt/decrypt */
ieee->host_encrypt = 1; ieee->host_encrypt = 1;
ieee->host_decrypt = 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_LIST_HEAD(&ieee->crypt_deinit_list);
init_timer(&ieee->crypt_deinit_timer); init_timer(&ieee->crypt_deinit_timer);
...@@ -141,21 +141,20 @@ struct net_device *alloc_ieee80211(int sizeof_priv) ...@@ -141,21 +141,20 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
spin_lock_init(&ieee->lock); spin_lock_init(&ieee->lock);
ieee->wpa_enabled = 0; ieee->wpa_enabled = 0;
ieee->tkip_countermeasures = 0; ieee->tkip_countermeasures = 0;
ieee->drop_unencrypted = 0; ieee->drop_unencrypted = 0;
ieee->privacy_invoked = 0; ieee->privacy_invoked = 0;
ieee->ieee802_1x = 1; ieee->ieee802_1x = 1;
return dev; return dev;
failed: failed:
if (dev) if (dev)
free_netdev(dev); free_netdev(dev);
return NULL; return NULL;
} }
void free_ieee80211(struct net_device *dev) void free_ieee80211(struct net_device *dev)
{ {
struct ieee80211_device *ieee = netdev_priv(dev); struct ieee80211_device *ieee = netdev_priv(dev);
...@@ -193,7 +192,7 @@ static int show_debug_level(char *page, char **start, off_t offset, ...@@ -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); 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) unsigned long count, void *data)
{ {
char buf[] = "0x00000000"; char buf[] = "0x00000000";
...@@ -264,13 +263,12 @@ static void __exit ieee80211_exit(void) ...@@ -264,13 +263,12 @@ static void __exit ieee80211_exit(void)
module_param(debug, int, 0444); module_param(debug, int, 0444);
MODULE_PARM_DESC(debug, "debug output mask"); MODULE_PARM_DESC(debug, "debug output mask");
module_exit(ieee80211_exit); module_exit(ieee80211_exit);
module_init(ieee80211_init); module_init(ieee80211_init);
#endif #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]; static char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
const char *s = essid; const char *s = essid;
char *d = escaped; char *d = escaped;
...@@ -280,7 +278,7 @@ const char *escape_essid(const char *essid, u8 essid_len) { ...@@ -280,7 +278,7 @@ const char *escape_essid(const char *essid, u8 essid_len) {
return escaped; 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--) { while (essid_len--) {
if (*s == '\0') { if (*s == '\0') {
*d++ = '\\'; *d++ = '\\';
......
net/ieee80211/ieee80211_rx.c
View file @ 0edd5b44
This diff is collapsed.
net/ieee80211/ieee80211_tx.c
View file @ 0edd5b44
...@@ -45,10 +45,8 @@ ...@@ -45,10 +45,8 @@
#include <net/ieee80211.h> #include <net/ieee80211.h>
/* /*
802.11 Data Frame 802.11 Data Frame
,-------------------------------------------------------------------. ,-------------------------------------------------------------------.
...@@ -82,7 +80,6 @@ Desc. | IV | Encrypted | ICV | ...@@ -82,7 +80,6 @@ Desc. | IV | Encrypted | ICV |
`-----------------------' `-----------------------'
Total: 8 non-data bytes Total: 8 non-data bytes
802.3 Ethernet Data Frame 802.3 Ethernet Data Frame
,-----------------------------------------. ,-----------------------------------------.
...@@ -131,7 +128,7 @@ payload of each frame is reduced to 492 bytes. ...@@ -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 P802_1H_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0xf8 };
static u8 RFC1042_OUI[P80211_OUI_LEN] = { 0x00, 0x00, 0x00 }; 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; struct ieee80211_snap_hdr *snap;
u8 *oui; u8 *oui;
...@@ -149,17 +146,15 @@ static inline int ieee80211_put_snap(u8 *data, u16 h_proto) ...@@ -149,17 +146,15 @@ static inline int ieee80211_put_snap(u8 *data, u16 h_proto)
snap->oui[1] = oui[1]; snap->oui[1] = oui[1];
snap->oui[2] = oui[2]; snap->oui[2] = oui[2];
*(u16 *)(data + SNAP_SIZE) = htons(h_proto); *(u16 *) (data + SNAP_SIZE) = htons(h_proto);
return SNAP_SIZE + sizeof(u16); return SNAP_SIZE + sizeof(u16);
} }
static inline int ieee80211_encrypt_fragment( static inline int ieee80211_encrypt_fragment(struct ieee80211_device *ieee,
struct ieee80211_device *ieee, struct sk_buff *frag, int hdr_len)
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; int res;
#ifdef CONFIG_IEEE80211_CRYPT_TKIP #ifdef CONFIG_IEEE80211_CRYPT_TKIP
...@@ -167,7 +162,7 @@ static inline int ieee80211_encrypt_fragment( ...@@ -167,7 +162,7 @@ static inline int ieee80211_encrypt_fragment(
if (ieee->tkip_countermeasures && if (ieee->tkip_countermeasures &&
crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) { crypt && crypt->ops && strcmp(crypt->ops->name, "TKIP") == 0) {
header = (struct ieee80211_hdr *) frag->data; header = (struct ieee80211_hdr *)frag->data;
if (net_ratelimit()) { if (net_ratelimit()) {
printk(KERN_DEBUG "%s: TKIP countermeasures: dropped " printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
"TX packet to " MAC_FMT "\n", "TX packet to " MAC_FMT "\n",
...@@ -200,8 +195,8 @@ static inline int ieee80211_encrypt_fragment( ...@@ -200,8 +195,8 @@ static inline int ieee80211_encrypt_fragment(
return 0; return 0;
} }
void ieee80211_txb_free(struct ieee80211_txb *txb)
void ieee80211_txb_free(struct ieee80211_txb *txb) { {
int i; int i;
if (unlikely(!txb)) if (unlikely(!txb))
return; return;
...@@ -216,9 +211,8 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size, ...@@ -216,9 +211,8 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size,
{ {
struct ieee80211_txb *txb; struct ieee80211_txb *txb;
int i; int i;
txb = kmalloc( txb = kmalloc(sizeof(struct ieee80211_txb) + (sizeof(u8 *) * nr_frags),
sizeof(struct ieee80211_txb) + (sizeof(u8*) * nr_frags), gfp_mask);
gfp_mask);
if (!txb) if (!txb)
return NULL; return NULL;
...@@ -243,8 +237,7 @@ static struct ieee80211_txb *ieee80211_alloc_txb(int nr_frags, int txb_size, ...@@ -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. */ /* SKBs are added to the ieee->tx_queue. */
int ieee80211_xmit(struct sk_buff *skb, int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
struct net_device *dev)
{ {
struct ieee80211_device *ieee = netdev_priv(dev); struct ieee80211_device *ieee = netdev_priv(dev);
struct ieee80211_txb *txb = NULL; struct ieee80211_txb *txb = NULL;
...@@ -255,21 +248,20 @@ int ieee80211_xmit(struct sk_buff *skb, ...@@ -255,21 +248,20 @@ int ieee80211_xmit(struct sk_buff *skb,
int ether_type, encrypt; int ether_type, encrypt;
int bytes, fc, hdr_len; int bytes, fc, hdr_len;
struct sk_buff *skb_frag; struct sk_buff *skb_frag;
struct ieee80211_hdr header = { /* Ensure zero initialized */ struct ieee80211_hdr header = { /* Ensure zero initialized */
.duration_id = 0, .duration_id = 0,
.seq_ctl = 0 .seq_ctl = 0
}; };
u8 dest[ETH_ALEN], src[ETH_ALEN]; u8 dest[ETH_ALEN], src[ETH_ALEN];
struct ieee80211_crypt_data* crypt; struct ieee80211_crypt_data *crypt;
spin_lock_irqsave(&ieee->lock, flags); spin_lock_irqsave(&ieee->lock, flags);
/* If there is no driver handler to take the TXB, dont' bother /* If there is no driver handler to take the TXB, dont' bother
* creating it... */ * creating it... */
if (!ieee->hard_start_xmit) { if (!ieee->hard_start_xmit) {
printk(KERN_WARNING "%s: No xmit handler.\n", printk(KERN_WARNING "%s: No xmit handler.\n", ieee->dev->name);
ieee->dev->name);
goto success; goto success;
} }
...@@ -284,7 +276,7 @@ int ieee80211_xmit(struct sk_buff *skb, ...@@ -284,7 +276,7 @@ int ieee80211_xmit(struct sk_buff *skb,
crypt = ieee->crypt[ieee->tx_keyidx]; crypt = ieee->crypt[ieee->tx_keyidx];
encrypt = !(ether_type == ETH_P_PAE && ieee->ieee802_1x) && 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 && if (!encrypt && ieee->ieee802_1x &&
ieee->drop_unencrypted && ether_type != ETH_P_PAE) { ieee->drop_unencrypted && ether_type != ETH_P_PAE) {
...@@ -294,7 +286,7 @@ int ieee80211_xmit(struct sk_buff *skb, ...@@ -294,7 +286,7 @@ int ieee80211_xmit(struct sk_buff *skb,
/* Save source and destination addresses */ /* Save source and destination addresses */
memcpy(&dest, skb->data, ETH_ALEN); 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 */ /* Advance the SKB to the start of the payload */
skb_pull(skb, sizeof(struct ethhdr)); skb_pull(skb, sizeof(struct ethhdr));
...@@ -304,7 +296,7 @@ int ieee80211_xmit(struct sk_buff *skb, ...@@ -304,7 +296,7 @@ int ieee80211_xmit(struct sk_buff *skb,
if (encrypt) if (encrypt)
fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA | fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA |
IEEE80211_FCTL_PROTECTED; IEEE80211_FCTL_PROTECTED;
else else
fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA; fc = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA;
...@@ -327,8 +319,7 @@ int ieee80211_xmit(struct sk_buff *skb, ...@@ -327,8 +319,7 @@ int ieee80211_xmit(struct sk_buff *skb,
/* Determine fragmentation size based on destination (multicast /* Determine fragmentation size based on destination (multicast
* and broadcast are not fragmented) */ * and broadcast are not fragmented) */
if (is_multicast_ether_addr(dest) || if (is_multicast_ether_addr(dest) || is_broadcast_ether_addr(dest))
is_broadcast_ether_addr(dest))
frag_size = MAX_FRAG_THRESHOLD; frag_size = MAX_FRAG_THRESHOLD;
else else
frag_size = ieee->fts; frag_size = ieee->fts;
...@@ -345,7 +336,7 @@ int ieee80211_xmit(struct sk_buff *skb, ...@@ -345,7 +336,7 @@ int ieee80211_xmit(struct sk_buff *skb,
/* Each fragment may need to have room for encryptiong pre/postfix */ /* Each fragment may need to have room for encryptiong pre/postfix */
if (encrypt) if (encrypt)
bytes_per_frag -= crypt->ops->extra_prefix_len + 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 / /* Number of fragments is the total bytes_per_frag /
* payload_per_fragment */ * payload_per_fragment */
...@@ -380,19 +371,19 @@ int ieee80211_xmit(struct sk_buff *skb, ...@@ -380,19 +371,19 @@ int ieee80211_xmit(struct sk_buff *skb,
/* If this is not the last fragment, then add the MOREFRAGS /* If this is not the last fragment, then add the MOREFRAGS
* bit to the frame control */ * bit to the frame control */
if (i != nr_frags - 1) { if (i != nr_frags - 1) {
frag_hdr->frame_ctl = cpu_to_le16( frag_hdr->frame_ctl =
fc | IEEE80211_FCTL_MOREFRAGS); cpu_to_le16(fc | IEEE80211_FCTL_MOREFRAGS);
bytes = bytes_per_frag; bytes = bytes_per_frag;
} else { } else {
/* The last fragment takes the remaining length */ /* The last fragment takes the remaining length */
bytes = bytes_last_frag; bytes = bytes_last_frag;
} }
/* Put a SNAP header on the first fragment */ /* Put a SNAP header on the first fragment */
if (i == 0) { if (i == 0) {
ieee80211_put_snap( ieee80211_put_snap(skb_put
skb_put(skb_frag, SNAP_SIZE + sizeof(u16)), (skb_frag, SNAP_SIZE + sizeof(u16)),
ether_type); ether_type);
bytes -= SNAP_SIZE + sizeof(u16); bytes -= SNAP_SIZE + sizeof(u16);
} }
...@@ -410,14 +401,13 @@ int ieee80211_xmit(struct sk_buff *skb, ...@@ -410,14 +401,13 @@ int ieee80211_xmit(struct sk_buff *skb,
skb_put(skb_frag, 4); skb_put(skb_frag, 4);
} }
success:
success:
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
if (txb) { if (txb) {
if ((*ieee->hard_start_xmit)(txb, dev) == 0) { if ((*ieee->hard_start_xmit) (txb, dev) == 0) {
stats->tx_packets++; stats->tx_packets++;
stats->tx_bytes += txb->payload_size; stats->tx_bytes += txb->payload_size;
return 0; return 0;
...@@ -427,7 +417,7 @@ int ieee80211_xmit(struct sk_buff *skb, ...@@ -427,7 +417,7 @@ int ieee80211_xmit(struct sk_buff *skb,
return 0; return 0;
failed: failed:
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
netif_stop_queue(dev); netif_stop_queue(dev);
stats->tx_errors++; stats->tx_errors++;
......
net/ieee80211/ieee80211_wx.c
View file @ 0edd5b44
...@@ -42,7 +42,7 @@ static const char *ieee80211_modes[] = { ...@@ -42,7 +42,7 @@ static const char *ieee80211_modes[] = {
#define MAX_CUSTOM_LEN 64 #define MAX_CUSTOM_LEN 64
static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee, static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
char *start, char *stop, char *start, char *stop,
struct ieee80211_network *network) struct ieee80211_network *network)
{ {
char custom[MAX_CUSTOM_LEN]; char custom[MAX_CUSTOM_LEN];
...@@ -66,29 +66,28 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee, ...@@ -66,29 +66,28 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
iwe.u.data.length = sizeof("<hidden>"); iwe.u.data.length = sizeof("<hidden>");
start = iwe_stream_add_point(start, stop, &iwe, "<hidden>"); start = iwe_stream_add_point(start, stop, &iwe, "<hidden>");
} else { } 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); start = iwe_stream_add_point(start, stop, &iwe, network->ssid);
} }
/* Add the protocol name */ /* Add the protocol name */
iwe.cmd = SIOCGIWNAME; 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); start = iwe_stream_add_event(start, stop, &iwe, IW_EV_CHAR_LEN);
/* Add mode */ /* Add mode */
iwe.cmd = SIOCGIWMODE; iwe.cmd = SIOCGIWMODE;
if (network->capability & if (network->capability & (WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
(WLAN_CAPABILITY_ESS | WLAN_CAPABILITY_IBSS)) {
if (network->capability & WLAN_CAPABILITY_ESS) if (network->capability & WLAN_CAPABILITY_ESS)
iwe.u.mode = IW_MODE_MASTER; iwe.u.mode = IW_MODE_MASTER;
else else
iwe.u.mode = IW_MODE_ADHOC; iwe.u.mode = IW_MODE_ADHOC;
start = iwe_stream_add_event(start, stop, &iwe, start = iwe_stream_add_event(start, stop, &iwe, IW_EV_UINT_LEN);
IW_EV_UINT_LEN);
} }
/* Add frequency/channel */ /* Add frequency/channel */
iwe.cmd = SIOCGIWFREQ; iwe.cmd = SIOCGIWFREQ;
/* iwe.u.freq.m = ieee80211_frequency(network->channel, network->mode); /* iwe.u.freq.m = ieee80211_frequency(network->channel, network->mode);
iwe.u.freq.e = 3; */ iwe.u.freq.e = 3; */
...@@ -110,7 +109,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee, ...@@ -110,7 +109,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
max_rate = 0; max_rate = 0;
p = custom; p = custom;
p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), " Rates (Mb/s): "); 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 && if (j < network->rates_ex_len &&
((network->rates_ex[j] & 0x7F) < ((network->rates_ex[j] & 0x7F) <
(network->rates[i] & 0x7F))) (network->rates[i] & 0x7F)))
...@@ -133,8 +132,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee, ...@@ -133,8 +132,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
iwe.cmd = SIOCGIWRATE; iwe.cmd = SIOCGIWRATE;
iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0; iwe.u.bitrate.fixed = iwe.u.bitrate.disabled = 0;
iwe.u.bitrate.value = max_rate * 500000; iwe.u.bitrate.value = max_rate * 500000;
start = iwe_stream_add_event(start, stop, &iwe, start = iwe_stream_add_event(start, stop, &iwe, IW_EV_PARAM_LEN);
IW_EV_PARAM_LEN);
iwe.cmd = IWEVCUSTOM; iwe.cmd = IWEVCUSTOM;
iwe.u.data.length = p - custom; iwe.u.data.length = p - custom;
...@@ -164,7 +162,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee, ...@@ -164,7 +162,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
if (iwe.u.data.length) if (iwe.u.data.length)
start = iwe_stream_add_point(start, stop, &iwe, custom); 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]; char buf[MAX_WPA_IE_LEN * 2 + 30];
u8 *p = buf; u8 *p = buf;
...@@ -179,7 +177,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee, ...@@ -179,7 +177,7 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
start = iwe_stream_add_point(start, stop, &iwe, buf); 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]; char buf[MAX_WPA_IE_LEN * 2 + 30];
u8 *p = buf; u8 *p = buf;
...@@ -199,12 +197,12 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee, ...@@ -199,12 +197,12 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
iwe.cmd = IWEVCUSTOM; iwe.cmd = IWEVCUSTOM;
p = custom; p = custom;
p += snprintf(p, MAX_CUSTOM_LEN - (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; iwe.u.data.length = p - custom;
if (iwe.u.data.length) if (iwe.u.data.length)
start = iwe_stream_add_point(start, stop, &iwe, custom); start = iwe_stream_add_point(start, stop, &iwe, custom);
return start; return start;
} }
...@@ -229,18 +227,19 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee, ...@@ -229,18 +227,19 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
time_after(network->last_scanned + ieee->scan_age, jiffies)) time_after(network->last_scanned + ieee->scan_age, jiffies))
ev = ipw2100_translate_scan(ieee, ev, stop, network); ev = ipw2100_translate_scan(ieee, ev, stop, network);
else else
IEEE80211_DEBUG_SCAN( IEEE80211_DEBUG_SCAN("Not showing network '%s ("
"Not showing network '%s (" MAC_FMT ")' due to age (%lums).\n",
MAC_FMT ")' due to age (%lums).\n", escape_essid(network->ssid,
escape_essid(network->ssid, network->ssid_len),
network->ssid_len), MAC_ARG(network->bssid),
MAC_ARG(network->bssid), (jiffies -
(jiffies - network->last_scanned) / (HZ / 100)); network->last_scanned) / (HZ /
100));
} }
spin_unlock_irqrestore(&ieee->lock, flags); spin_unlock_irqrestore(&ieee->lock, flags);
wrqu->data.length = ev - extra; wrqu->data.length = ev - extra;
wrqu->data.flags = 0; wrqu->data.flags = 0;
IEEE80211_DEBUG_WX("exit: %d networks returned.\n", i); IEEE80211_DEBUG_WX("exit: %d networks returned.\n", i);
...@@ -292,8 +291,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, ...@@ -292,8 +291,8 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
if (ieee->crypt[i] != NULL) { if (ieee->crypt[i] != NULL) {
if (key_provided) if (key_provided)
break; break;
ieee80211_crypt_delayed_deinit( ieee80211_crypt_delayed_deinit(ieee,
ieee, &ieee->crypt[i]); &ieee->crypt[i]);
} }
} }
...@@ -306,8 +305,6 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, ...@@ -306,8 +305,6 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
goto done; goto done;
} }
sec.enabled = 1; sec.enabled = 1;
sec.flags |= SEC_ENABLED; sec.flags |= SEC_ENABLED;
...@@ -341,8 +338,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, ...@@ -341,8 +338,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
new_crypt = NULL; new_crypt = NULL;
printk(KERN_WARNING "%s: could not initialize WEP: " printk(KERN_WARNING "%s: could not initialize WEP: "
"load module ieee80211_crypt_wep\n", "load module ieee80211_crypt_wep\n", dev->name);
dev->name);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
*crypt = new_crypt; *crypt = new_crypt;
...@@ -359,7 +355,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, ...@@ -359,7 +355,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
key, escape_essid(sec.keys[key], len), key, escape_essid(sec.keys[key], len),
erq->length, len); erq->length, len);
sec.key_sizes[key] = 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); (*crypt)->priv);
sec.flags |= (1 << key); sec.flags |= (1 << key);
/* This ensures a key will be activated if no key is /* This ensures a key will be activated if no key is
...@@ -382,15 +378,15 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, ...@@ -382,15 +378,15 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee,
/* No key data - just set the default TX key index */ /* No key data - just set the default TX key index */
if (key_provided) { if (key_provided) {
IEEE80211_DEBUG_WX( IEEE80211_DEBUG_WX
"Setting key %d to default Tx key.\n", key); ("Setting key %d to default Tx key.\n", key);
ieee->tx_keyidx = key; ieee->tx_keyidx = key;
sec.active_key = key; sec.active_key = key;
sec.flags |= SEC_ACTIVE_KEY; sec.flags |= SEC_ACTIVE_KEY;
} }
} }
done: done:
ieee->open_wep = !(erq->flags & IW_ENCODE_RESTRICTED); ieee->open_wep = !(erq->flags & IW_ENCODE_RESTRICTED);
sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY; sec.auth_mode = ieee->open_wep ? WLAN_AUTH_OPEN : WLAN_AUTH_SHARED_KEY;
sec.flags |= SEC_AUTH_MODE; sec.flags |= SEC_AUTH_MODE;
...@@ -400,7 +396,7 @@ int ieee80211_wx_set_encode(struct ieee80211_device *ieee, ...@@ -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... /* 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 */ * TODO: When WPA is added this is one place that needs to change */
sec.flags |= SEC_LEVEL; 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) if (ieee->set_security)
ieee->set_security(dev, &sec); ieee->set_security(dev, &sec);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7