mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 21:33:00 +00:00
staging: rtl8187se: Delete commented code and whiteline
Delete all commented code and whitelines in ieee80211/ieee80211_crypt_wep.c that are not necessary. Fix sparse warnings: ERROR: do not use C99 // comments Signed-off-by: Ana Rey <anarey@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
7a0873e13b
commit
b5d7af439b
@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
||||||
|
|
||||||
//#include <linux/config.h>
|
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/random.h>
|
#include <linux/random.h>
|
||||||
@ -28,8 +27,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
|
||||||
@ -40,7 +37,6 @@ struct prism2_wep_data {
|
|||||||
struct crypto_blkcipher *rx_tfm;
|
struct crypto_blkcipher *rx_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;
|
||||||
@ -79,7 +75,6 @@ fail:
|
|||||||
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;
|
||||||
@ -94,7 +89,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.
|
||||||
@ -157,7 +151,6 @@ static int prism2_wep_encrypt(struct sk_buff *skb, int hdr_len, void *priv)
|
|||||||
return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);
|
return crypto_blkcipher_encrypt(&desc, &sg, &sg, len + 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* 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.
|
||||||
@ -219,7 +212,6 @@ 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;
|
||||||
@ -233,7 +225,6 @@ 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;
|
||||||
@ -246,7 +237,6 @@ 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;
|
||||||
@ -255,7 +245,6 @@ static char *prism2_wep_print_stats(char *p, void *priv)
|
|||||||
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,
|
||||||
@ -272,21 +261,17 @@ static struct ieee80211_crypto_ops ieee80211_crypt_wep = {
|
|||||||
.owner = THIS_MODULE,
|
.owner = THIS_MODULE,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
int ieee80211_crypto_wep_init(void)
|
int ieee80211_crypto_wep_init(void)
|
||||||
{
|
{
|
||||||
return ieee80211_register_crypto_ops(&ieee80211_crypt_wep);
|
return ieee80211_register_crypto_ops(&ieee80211_crypt_wep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ieee80211_crypto_wep_exit(void)
|
void ieee80211_crypto_wep_exit(void)
|
||||||
{
|
{
|
||||||
ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep);
|
ieee80211_unregister_crypto_ops(&ieee80211_crypt_wep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void ieee80211_wep_null(void)
|
void ieee80211_wep_null(void)
|
||||||
{
|
{
|
||||||
// printk("============>%s()\n", __func__);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user