Skip to content

L
linux
Commit fdc64a9e authored by Sebastian Hahn's avatar Sebastian Hahn Committed by Greg Kroah-Hartman
Browse files
Options

staging/rtl8192u: indent with tabs, not spaces 

Converted staging/rtl8187se to use tabs instead of spaces for
indentation to fix the checkpatch error "code indent should use tabs
where possible".
Signed-off-by: default avatarSebastian Hahn <snsehahn@cip.cs.fau.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0db7a34e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 365 additions and 365 deletions
drivers/staging/rtl8192u/ieee80211/ieee80211.h
View file @ fdc64a9e
...@@ -2088,10 +2088,10 @@ struct ieee80211_device { ...@@ -2088,10 +2088,10 @@ struct ieee80211_device {
struct delayed_work start_ibss_wq; struct delayed_work start_ibss_wq;
struct work_struct wx_sync_scan_wq; struct work_struct wx_sync_scan_wq;
struct workqueue_struct *wq; struct workqueue_struct *wq;
// Qos related. Added by Annie, 2005-11-01. // Qos related. Added by Annie, 2005-11-01.
//STA_QOS StaQos; //STA_QOS StaQos;
//u32 STA_EDCA_PARAM[4]; //u32 STA_EDCA_PARAM[4];
//CHANNEL_ACCESS_SETTING ChannelAccessSetting; //CHANNEL_ACCESS_SETTING ChannelAccessSetting;
...@@ -2107,11 +2107,11 @@ struct ieee80211_device { ...@@ -2107,11 +2107,11 @@ struct ieee80211_device {
struct net_device *dev); struct net_device *dev);
int (*reset_port)(struct net_device *dev); int (*reset_port)(struct net_device *dev);
int (*is_queue_full) (struct net_device * dev, int pri); int (*is_queue_full) (struct net_device * dev, int pri);
int (*handle_management) (struct net_device * dev, int (*handle_management) (struct net_device * dev,
struct ieee80211_network * network, u16 type); struct ieee80211_network * network, u16 type);
int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb); int (*is_qos_active) (struct net_device *dev, struct sk_buff *skb);
/* Softmac-generated frames (management) are TXed via this /* Softmac-generated frames (management) are TXed via this
* callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is
......
drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c
View file @ fdc64a9e
...@@ -2503,8 +2503,8 @@ void ieee80211_disassociate(struct ieee80211_device *ieee) ...@@ -2503,8 +2503,8 @@ void ieee80211_disassociate(struct ieee80211_device *ieee)
} }
void ieee80211_associate_retry_wq(struct work_struct *work) void ieee80211_associate_retry_wq(struct work_struct *work)
{ {
struct delayed_work *dwork = container_of(work, struct delayed_work, work); struct delayed_work *dwork = container_of(work, struct delayed_work, work);
struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, associate_retry_wq); struct ieee80211_device *ieee = container_of(dwork, struct ieee80211_device, associate_retry_wq);
unsigned long flags; unsigned long flags;
down(&ieee->wx_sem); down(&ieee->wx_sem);
......
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c
View file @ fdc64a9e
...@@ -70,7 +70,7 @@ val | 0 | 0 | 0 | 1 | x | 0 | 0 | 0 | 1 | 0 | x | x | x ...@@ -70,7 +70,7 @@ val | 0 | 0 | 0 | 1 | x | 0 | 0 | 0 | 1 | 0 | x | x | x
desc | ^-ver-^ | ^type-^ | ^-----subtype-----^ | to |from |more |retry| pwr |more |wep | desc | ^-ver-^ | ^type-^ | ^-----subtype-----^ | to |from |more |retry| pwr |more |wep |
| | | x=0 data,x=1 data+ack | DS | DS |frag | | mgm |data | | | | | x=0 data,x=1 data+ack | DS | DS |frag | | mgm |data | |
'-----------------------------------------------------------------------------------------' '-----------------------------------------------------------------------------------------'
/\ /\
| |
802.11 Data Frame | 802.11 Data Frame |
,--------- 'ctrl' expands to >-----------' ,--------- 'ctrl' expands to >-----------'
...@@ -656,17 +656,17 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -656,17 +656,17 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
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));
/* Determine total amount of storage required for TXB packets */ /* Determine total amount of storage required for TXB packets */
bytes = skb->len + SNAP_SIZE + sizeof(u16); bytes = skb->len + SNAP_SIZE + sizeof(u16);
if (encrypt) if (encrypt)
fc = IEEE80211_FTYPE_DATA | IEEE80211_FCTL_WEP; fc = IEEE80211_FTYPE_DATA | IEEE80211_FCTL_WEP;
else else
fc = IEEE80211_FTYPE_DATA; fc = IEEE80211_FTYPE_DATA;
//if(ieee->current_network.QoS_Enable) //if(ieee->current_network.QoS_Enable)
if(qos_actived) if(qos_actived)
...@@ -689,7 +689,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -689,7 +689,7 @@ int ieee80211_xmit(struct sk_buff *skb, struct net_device *dev)
memcpy(&header.addr3, ieee->current_network.bssid, ETH_ALEN); memcpy(&header.addr3, ieee->current_network.bssid, ETH_ALEN);
} }
header.frame_ctl = cpu_to_le16(fc); header.frame_ctl = cpu_to_le16(fc);
/* Determine fragmentation size based on destination (multicast /* Determine fragmentation size based on destination (multicast
* and broadcast are not fragmented) */ * and broadcast are not fragmented) */
......
drivers/staging/rtl8192u/ieee80211/rtl_crypto.h
View file @ fdc64a9e
...@@ -73,7 +73,7 @@ struct cipher_alg { ...@@ -73,7 +73,7 @@ struct cipher_alg {
unsigned int cia_min_keysize; unsigned int cia_min_keysize;
unsigned int cia_max_keysize; unsigned int cia_max_keysize;
int (*cia_setkey)(void *ctx, const u8 *key, int (*cia_setkey)(void *ctx, const u8 *key,
unsigned int keylen, u32 *flags); unsigned int keylen, u32 *flags);
void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src); void (*cia_encrypt)(void *ctx, u8 *dst, const u8 *src);
void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src); void (*cia_decrypt)(void *ctx, u8 *dst, const u8 *src);
}; };
...@@ -84,16 +84,16 @@ struct digest_alg { ...@@ -84,16 +84,16 @@ struct digest_alg {
void (*dia_update)(void *ctx, const u8 *data, unsigned int len); void (*dia_update)(void *ctx, const u8 *data, unsigned int len);
void (*dia_final)(void *ctx, u8 *out); void (*dia_final)(void *ctx, u8 *out);
int (*dia_setkey)(void *ctx, const u8 *key, int (*dia_setkey)(void *ctx, const u8 *key,
unsigned int keylen, u32 *flags); unsigned int keylen, u32 *flags);
}; };
struct compress_alg { struct compress_alg {
int (*coa_init)(void *ctx); int (*coa_init)(void *ctx);
void (*coa_exit)(void *ctx); void (*coa_exit)(void *ctx);
int (*coa_compress)(void *ctx, const u8 *src, unsigned int slen, int (*coa_compress)(void *ctx, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen); u8 *dst, unsigned int *dlen);
int (*coa_decompress)(void *ctx, const u8 *src, unsigned int slen, int (*coa_decompress)(void *ctx, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen); u8 *dst, unsigned int *dlen);
}; };
#define cra_cipher cra_u.cipher #define cra_cipher cra_u.cipher
...@@ -139,15 +139,15 @@ struct cipher_tfm { ...@@ -139,15 +139,15 @@ struct cipher_tfm {
unsigned int cit_ivsize; unsigned int cit_ivsize;
u32 cit_mode; u32 cit_mode;
int (*cit_setkey)(struct crypto_tfm *tfm, int (*cit_setkey)(struct crypto_tfm *tfm,
const u8 *key, unsigned int keylen); const u8 *key, unsigned int keylen);
int (*cit_encrypt)(struct crypto_tfm *tfm, int (*cit_encrypt)(struct crypto_tfm *tfm,
struct scatterlist *dst, struct scatterlist *dst,
struct scatterlist *src, struct scatterlist *src,
unsigned int nbytes); unsigned int nbytes);
int (*cit_encrypt_iv)(struct crypto_tfm *tfm, int (*cit_encrypt_iv)(struct crypto_tfm *tfm,
struct scatterlist *dst, struct scatterlist *dst,
struct scatterlist *src, struct scatterlist *src,
unsigned int nbytes, u8 *iv); unsigned int nbytes, u8 *iv);
int (*cit_decrypt)(struct crypto_tfm *tfm, int (*cit_decrypt)(struct crypto_tfm *tfm,
struct scatterlist *dst, struct scatterlist *dst,
struct scatterlist *src, struct scatterlist *src,
...@@ -162,12 +162,12 @@ struct cipher_tfm { ...@@ -162,12 +162,12 @@ struct cipher_tfm {
struct digest_tfm { struct digest_tfm {
void (*dit_init)(struct crypto_tfm *tfm); void (*dit_init)(struct crypto_tfm *tfm);
void (*dit_update)(struct crypto_tfm *tfm, void (*dit_update)(struct crypto_tfm *tfm,
struct scatterlist *sg, unsigned int nsg); struct scatterlist *sg, unsigned int nsg);
void (*dit_final)(struct crypto_tfm *tfm, u8 *out); void (*dit_final)(struct crypto_tfm *tfm, u8 *out);
void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg, void (*dit_digest)(struct crypto_tfm *tfm, struct scatterlist *sg,
unsigned int nsg, u8 *out); unsigned int nsg, u8 *out);
int (*dit_setkey)(struct crypto_tfm *tfm, int (*dit_setkey)(struct crypto_tfm *tfm,
const u8 *key, unsigned int keylen); const u8 *key, unsigned int keylen);
#ifdef CONFIG_CRYPTO_HMAC #ifdef CONFIG_CRYPTO_HMAC
void *dit_hmac_block; void *dit_hmac_block;
#endif #endif
...@@ -175,11 +175,11 @@ struct digest_tfm { ...@@ -175,11 +175,11 @@ struct digest_tfm {
struct compress_tfm { struct compress_tfm {
int (*cot_compress)(struct crypto_tfm *tfm, int (*cot_compress)(struct crypto_tfm *tfm,
const u8 *src, unsigned int slen, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen); u8 *dst, unsigned int *dlen);
int (*cot_decompress)(struct crypto_tfm *tfm, int (*cot_decompress)(struct crypto_tfm *tfm,
const u8 *src, unsigned int slen, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen); u8 *dst, unsigned int *dlen);
}; };
#define crt_cipher crt_u.cipher #define crt_cipher crt_u.cipher
...@@ -277,8 +277,8 @@ static inline void crypto_digest_init(struct crypto_tfm *tfm) ...@@ -277,8 +277,8 @@ static inline void crypto_digest_init(struct crypto_tfm *tfm)
} }
static inline void crypto_digest_update(struct crypto_tfm *tfm, static inline void crypto_digest_update(struct crypto_tfm *tfm,
struct scatterlist *sg, struct scatterlist *sg,
unsigned int nsg) unsigned int nsg)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
tfm->crt_digest.dit_update(tfm, sg, nsg); tfm->crt_digest.dit_update(tfm, sg, nsg);
...@@ -291,15 +291,15 @@ static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out) ...@@ -291,15 +291,15 @@ static inline void crypto_digest_final(struct crypto_tfm *tfm, u8 *out)
} }
static inline void crypto_digest_digest(struct crypto_tfm *tfm, static inline void crypto_digest_digest(struct crypto_tfm *tfm,
struct scatterlist *sg, struct scatterlist *sg,
unsigned int nsg, u8 *out) unsigned int nsg, u8 *out)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
tfm->crt_digest.dit_digest(tfm, sg, nsg, out); tfm->crt_digest.dit_digest(tfm, sg, nsg, out);
} }
static inline int crypto_digest_setkey(struct crypto_tfm *tfm, static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
const u8 *key, unsigned int keylen) const u8 *key, unsigned int keylen)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_DIGEST);
if (tfm->crt_digest.dit_setkey == NULL) if (tfm->crt_digest.dit_setkey == NULL)
...@@ -308,25 +308,25 @@ static inline int crypto_digest_setkey(struct crypto_tfm *tfm, ...@@ -308,25 +308,25 @@ static inline int crypto_digest_setkey(struct crypto_tfm *tfm,
} }
static inline int crypto_cipher_setkey(struct crypto_tfm *tfm, static inline int crypto_cipher_setkey(struct crypto_tfm *tfm,
const u8 *key, unsigned int keylen) const u8 *key, unsigned int keylen)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->crt_cipher.cit_setkey(tfm, key, keylen); return tfm->crt_cipher.cit_setkey(tfm, key, keylen);
} }
static inline int crypto_cipher_encrypt(struct crypto_tfm *tfm, static inline int crypto_cipher_encrypt(struct crypto_tfm *tfm,
struct scatterlist *dst, struct scatterlist *dst,
struct scatterlist *src, struct scatterlist *src,
unsigned int nbytes) unsigned int nbytes)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->crt_cipher.cit_encrypt(tfm, dst, src, nbytes); return tfm->crt_cipher.cit_encrypt(tfm, dst, src, nbytes);
} }
static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm, static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
struct scatterlist *dst, struct scatterlist *dst,
struct scatterlist *src, struct scatterlist *src,
unsigned int nbytes, u8 *iv) unsigned int nbytes, u8 *iv)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB); BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
...@@ -334,18 +334,18 @@ static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm, ...@@ -334,18 +334,18 @@ static inline int crypto_cipher_encrypt_iv(struct crypto_tfm *tfm,
} }
static inline int crypto_cipher_decrypt(struct crypto_tfm *tfm, static inline int crypto_cipher_decrypt(struct crypto_tfm *tfm,
struct scatterlist *dst, struct scatterlist *dst,
struct scatterlist *src, struct scatterlist *src,
unsigned int nbytes) unsigned int nbytes)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
return tfm->crt_cipher.cit_decrypt(tfm, dst, src, nbytes); return tfm->crt_cipher.cit_decrypt(tfm, dst, src, nbytes);
} }
static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm, static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
struct scatterlist *dst, struct scatterlist *dst,
struct scatterlist *src, struct scatterlist *src,
unsigned int nbytes, u8 *iv) unsigned int nbytes, u8 *iv)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB); BUG_ON(tfm->crt_cipher.cit_mode == CRYPTO_TFM_MODE_ECB);
...@@ -353,30 +353,30 @@ static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm, ...@@ -353,30 +353,30 @@ static inline int crypto_cipher_decrypt_iv(struct crypto_tfm *tfm,
} }
static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm, static inline void crypto_cipher_set_iv(struct crypto_tfm *tfm,
const u8 *src, unsigned int len) const u8 *src, unsigned int len)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
memcpy(tfm->crt_cipher.cit_iv, src, len); memcpy(tfm->crt_cipher.cit_iv, src, len);
} }
static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm, static inline void crypto_cipher_get_iv(struct crypto_tfm *tfm,
u8 *dst, unsigned int len) u8 *dst, unsigned int len)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_CIPHER);
memcpy(dst, tfm->crt_cipher.cit_iv, len); memcpy(dst, tfm->crt_cipher.cit_iv, len);
} }
static inline int crypto_comp_compress(struct crypto_tfm *tfm, static inline int crypto_comp_compress(struct crypto_tfm *tfm,
const u8 *src, unsigned int slen, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen) u8 *dst, unsigned int *dlen)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen); return tfm->crt_compress.cot_compress(tfm, src, slen, dst, dlen);
} }
static inline int crypto_comp_decompress(struct crypto_tfm *tfm, static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
const u8 *src, unsigned int slen, const u8 *src, unsigned int slen,
u8 *dst, unsigned int *dlen) u8 *dst, unsigned int *dlen)
{ {
BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS); BUG_ON(crypto_tfm_alg_type(tfm) != CRYPTO_ALG_TYPE_COMPRESS);
return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen); return tfm->crt_compress.cot_decompress(tfm, src, slen, dst, dlen);
...@@ -388,11 +388,11 @@ static inline int crypto_comp_decompress(struct crypto_tfm *tfm, ...@@ -388,11 +388,11 @@ static inline int crypto_comp_decompress(struct crypto_tfm *tfm,
#ifdef CONFIG_CRYPTO_HMAC #ifdef CONFIG_CRYPTO_HMAC
void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen); void crypto_hmac_init(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen);
void crypto_hmac_update(struct crypto_tfm *tfm, void crypto_hmac_update(struct crypto_tfm *tfm,
struct scatterlist *sg, unsigned int nsg); struct scatterlist *sg, unsigned int nsg);
void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key, void crypto_hmac_final(struct crypto_tfm *tfm, u8 *key,
unsigned int *keylen, u8 *out); unsigned int *keylen, u8 *out);
void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen, void crypto_hmac(struct crypto_tfm *tfm, u8 *key, unsigned int *keylen,
struct scatterlist *sg, unsigned int nsg, u8 *out); struct scatterlist *sg, unsigned int nsg, u8 *out);
#endif /* CONFIG_CRYPTO_HMAC */ #endif /* CONFIG_CRYPTO_HMAC */
#endif /* _LINUX_CRYPTO_H */ #endif /* _LINUX_CRYPTO_H */
drivers/staging/rtl8192u/r8180_93cx6.c
View file @ fdc64a9e
...@@ -95,7 +95,7 @@ u32 eprom_read(struct net_device *dev, u32 addr) ...@@ -95,7 +95,7 @@ u32 eprom_read(struct net_device *dev, u32 addr)
u32 ret; u32 ret;
ret=0; ret=0;
//enable EPROM programming //enable EPROM programming
write_nic_byte_E(dev, EPROM_CMD, write_nic_byte_E(dev, EPROM_CMD,
(EPROM_CMD_PROGRAM<<EPROM_CMD_OPERATING_MODE_SHIFT)); (EPROM_CMD_PROGRAM<<EPROM_CMD_OPERATING_MODE_SHIFT));
force_pci_posting(dev); force_pci_posting(dev);
......
drivers/staging/rtl8192u/r8180_pm.h
View file @ fdc64a9e
/* /*
Power management interface routines. Power management interface routines.
Written by Mariusz Matuszek. Written by Mariusz Matuszek.
This code is currently just a placeholder for later work and This code is currently just a placeholder for later work and
does not do anything useful. does not do anything useful.
......
drivers/staging/rtl8192u/r8192U.h
View file @ fdc64a9e
...@@ -136,26 +136,26 @@ do { if(rt_global_debug_component & component) \ ...@@ -136,26 +136,26 @@ do { if(rt_global_debug_component & component) \
#define RTL819x_DEBUG #define RTL819x_DEBUG
#ifdef RTL819x_DEBUG #ifdef RTL819x_DEBUG
#define assert(expr) \ #define assert(expr) \
if (!(expr)) { \ if (!(expr)) { \
printk( "Assertion failed! %s,%s,%s,line=%d\n", \ printk( "Assertion failed! %s,%s,%s,line=%d\n", \
#expr,__FILE__,__FUNCTION__,__LINE__); \ #expr,__FILE__,__FUNCTION__,__LINE__); \
} }
//wb added to debug out data buf //wb added to debug out data buf
//if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA //if you want print DATA buffer related BA, please set ieee80211_debug_level to DATA|BA
#define RT_DEBUG_DATA(level, data, datalen) \ #define RT_DEBUG_DATA(level, data, datalen) \
do{ if ((rt_global_debug_component & (level)) == (level)) \ do{ if ((rt_global_debug_component & (level)) == (level)) \
{ \ { \
int i; \ int i; \
u8* pdata = (u8*) data; \ u8* pdata = (u8*) data; \
printk(KERN_DEBUG RTL819xU_MODULE_NAME ": %s()\n", __FUNCTION__); \ printk(KERN_DEBUG RTL819xU_MODULE_NAME ": %s()\n", __FUNCTION__); \
for(i=0; i<(int)(datalen); i++) \ for(i=0; i<(int)(datalen); i++) \
{ \ { \
printk("%2x ", pdata[i]); \ printk("%2x ", pdata[i]); \
if ((i+1)%16 == 0) printk("\n"); \ if ((i+1)%16 == 0) printk("\n"); \
} \ } \
printk("\n"); \ printk("\n"); \
} \ } \
} while (0) } while (0)
#else #else
#define assert(expr) do {} while (0) #define assert(expr) do {} while (0)
#define RT_DEBUG_DATA(level, data, datalen) do {} while(0) #define RT_DEBUG_DATA(level, data, datalen) do {} while(0)
...@@ -214,42 +214,42 @@ do { if(rt_global_debug_component & component) \ ...@@ -214,42 +214,42 @@ do { if(rt_global_debug_component & component) \
/* for rtl819x */ /* for rtl819x */
typedef struct _tx_desc_819x_usb { typedef struct _tx_desc_819x_usb {
//DWORD 0 //DWORD 0
u16 PktSize; u16 PktSize;
u8 Offset; u8 Offset;
u8 Reserved0:3; u8 Reserved0:3;
u8 CmdInit:1; u8 CmdInit:1;
u8 LastSeg:1; u8 LastSeg:1;
u8 FirstSeg:1; u8 FirstSeg:1;
u8 LINIP:1; u8 LINIP:1;
u8 OWN:1; u8 OWN:1;
//DWORD 1 //DWORD 1
u8 TxFWInfoSize; u8 TxFWInfoSize;
u8 RATid:3; u8 RATid:3;
u8 DISFB:1; u8 DISFB:1;
u8 USERATE:1; u8 USERATE:1;
u8 MOREFRAG:1; u8 MOREFRAG:1;
u8 NoEnc:1; u8 NoEnc:1;
u8 PIFS:1; u8 PIFS:1;
u8 QueueSelect:5; u8 QueueSelect:5;
u8 NoACM:1; u8 NoACM:1;
u8 Reserved1:2; u8 Reserved1:2;
u8 SecCAMID:5; u8 SecCAMID:5;
u8 SecDescAssign:1; u8 SecDescAssign:1;
u8 SecType:2; u8 SecType:2;
//DWORD 2 //DWORD 2
u16 TxBufferSize; u16 TxBufferSize;
//u16 Reserved2; //u16 Reserved2;
u8 ResvForPaddingLen:7; u8 ResvForPaddingLen:7;
u8 Reserved3:1; u8 Reserved3:1;
u8 Reserved4; u8 Reserved4;
//DWORD 3, 4, 5 //DWORD 3, 4, 5
u32 Reserved5; u32 Reserved5;
u32 Reserved6; u32 Reserved6;
u32 Reserved7; u32 Reserved7;
}tx_desc_819x_usb, *ptx_desc_819x_usb; }tx_desc_819x_usb, *ptx_desc_819x_usb;
#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
...@@ -280,7 +280,7 @@ typedef struct _tx_desc_819x_usb_aggr_subframe { ...@@ -280,7 +280,7 @@ typedef struct _tx_desc_819x_usb_aggr_subframe {
typedef struct _tx_desc_cmd_819x_usb { typedef struct _tx_desc_cmd_819x_usb {
//DWORD 0 //DWORD 0
u16 Reserved0; u16 Reserved0;
u8 Reserved1; u8 Reserved1;
u8 Reserved2:3; u8 Reserved2:3;
...@@ -290,14 +290,14 @@ typedef struct _tx_desc_cmd_819x_usb { ...@@ -290,14 +290,14 @@ typedef struct _tx_desc_cmd_819x_usb {
u8 LINIP:1; u8 LINIP:1;
u8 OWN:1; u8 OWN:1;
//DOWRD 1 //DOWRD 1
//u32 Reserved3; //u32 Reserved3;
u8 TxFWInfoSize; u8 TxFWInfoSize;
u8 Reserved3; u8 Reserved3;
u8 QueueSelect; u8 QueueSelect;
u8 Reserved4; u8 Reserved4;
//DOWRD 2 //DOWRD 2
u16 TxBufferSize; u16 TxBufferSize;
u16 Reserved5; u16 Reserved5;
...@@ -311,34 +311,34 @@ typedef struct _tx_desc_cmd_819x_usb { ...@@ -311,34 +311,34 @@ typedef struct _tx_desc_cmd_819x_usb {
typedef struct _tx_fwinfo_819x_usb { typedef struct _tx_fwinfo_819x_usb {
//DOWRD 0 //DOWRD 0
u8 TxRate:7; u8 TxRate:7;
u8 CtsEnable:1; u8 CtsEnable:1;
u8 RtsRate:7; u8 RtsRate:7;
u8 RtsEnable:1; u8 RtsEnable:1;
u8 TxHT:1; u8 TxHT:1;
u8 Short:1; //Short PLCP for CCK, or short GI for 11n MCS u8 Short:1; //Short PLCP for CCK, or short GI for 11n MCS
u8 TxBandwidth:1; // This is used for HT MCS rate only. u8 TxBandwidth:1; // This is used for HT MCS rate only.
u8 TxSubCarrier:2; // This is used for legacy OFDM rate only. u8 TxSubCarrier:2; // This is used for legacy OFDM rate only.
u8 STBC:2; u8 STBC:2;
u8 AllowAggregation:1; u8 AllowAggregation:1;
u8 RtsHT:1; //Interpret RtsRate field as high throughput data rate u8 RtsHT:1; //Interpret RtsRate field as high throughput data rate
u8 RtsShort:1; //Short PLCP for CCK, or short GI for 11n MCS u8 RtsShort:1; //Short PLCP for CCK, or short GI for 11n MCS
u8 RtsBandwidth:1; // This is used for HT MCS rate only. u8 RtsBandwidth:1; // This is used for HT MCS rate only.
u8 RtsSubcarrier:2; // This is used for legacy OFDM rate only. u8 RtsSubcarrier:2; // This is used for legacy OFDM rate only.
u8 RtsSTBC:2; u8 RtsSTBC:2;
u8 EnableCPUDur:1; //Enable firmware to recalculate and assign packet duration u8 EnableCPUDur:1; //Enable firmware to recalculate and assign packet duration
//DWORD 1 //DWORD 1
u32 RxMF:2; u32 RxMF:2;
u32 RxAMD:3; u32 RxAMD:3;
u32 TxPerPktInfoFeedback:1;//1 indicate Tx info gathtered by firmware and returned by Rx Cmd u32 TxPerPktInfoFeedback:1;//1 indicate Tx info gathtered by firmware and returned by Rx Cmd
u32 Reserved1:2; u32 Reserved1:2;
u32 TxAGCOffSet:4; u32 TxAGCOffSet:4;
u32 TxAGCSign:1; u32 TxAGCSign:1;
u32 Tx_INFO_RSVD:6; u32 Tx_INFO_RSVD:6;
u32 PacketID:13; u32 PacketID:13;
//u32 Reserved; //u32 Reserved;
}tx_fwinfo_819x_usb, *ptx_fwinfo_819x_usb; }tx_fwinfo_819x_usb, *ptx_fwinfo_819x_usb;
typedef struct rtl8192_rx_info { typedef struct rtl8192_rx_info {
...@@ -566,14 +566,14 @@ typedef struct buffer { ...@@ -566,14 +566,14 @@ typedef struct buffer {
} buffer; } buffer;
typedef struct rtl_reg_debug{ typedef struct rtl_reg_debug{
unsigned int cmd; unsigned int cmd;
struct { struct {
unsigned char type; unsigned char type;
unsigned char addr; unsigned char addr;
unsigned char page; unsigned char page;
unsigned char length; unsigned char length;
} head; } head;
unsigned char buf[0xff]; unsigned char buf[0xff];
}rtl_reg_debug; }rtl_reg_debug;
...@@ -739,11 +739,11 @@ typedef struct _BB_REGISTER_DEFINITION{ ...@@ -739,11 +739,11 @@ typedef struct _BB_REGISTER_DEFINITION{
}BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T; }BB_REGISTER_DEFINITION_T, *PBB_REGISTER_DEFINITION_T;
typedef enum _RT_RF_TYPE_819xU{ typedef enum _RT_RF_TYPE_819xU{
RF_TYPE_MIN = 0, RF_TYPE_MIN = 0,
RF_8225, RF_8225,
RF_8256, RF_8256,
RF_8258, RF_8258,
RF_PSEUDO_11N = 4, RF_PSEUDO_11N = 4,
}RT_RF_TYPE_819xU, *PRT_RF_TYPE_819xU; }RT_RF_TYPE_819xU, *PRT_RF_TYPE_819xU;
typedef struct _rate_adaptive { typedef struct _rate_adaptive {
...@@ -898,7 +898,7 @@ typedef struct r8192_priv { ...@@ -898,7 +898,7 @@ typedef struct r8192_priv {
spinlock_t irq_lock; spinlock_t irq_lock;
// spinlock_t irq_th_lock; // spinlock_t irq_th_lock;
spinlock_t tx_lock; spinlock_t tx_lock;
struct mutex mutex; struct mutex mutex;
//spinlock_t rf_lock; //used to lock rf write operation added by wb //spinlock_t rf_lock; //used to lock rf write operation added by wb
u16 irq_mask; u16 irq_mask;
...@@ -961,8 +961,8 @@ typedef struct r8192_priv { ...@@ -961,8 +961,8 @@ typedef struct r8192_priv {
atomic_t irt_counter;//count for irq_rx_tasklet atomic_t irt_counter;//count for irq_rx_tasklet
#endif #endif
#ifdef JACKSON_NEW_RX #ifdef JACKSON_NEW_RX
struct sk_buff **pp_rxskb; struct sk_buff **pp_rxskb;
int rx_inx; int rx_inx;
#endif #endif
/* modified by davad for Rx process */ /* modified by davad for Rx process */
......
drivers/staging/rtl8192u/r8192U_core.c
View file @ fdc64a9e
...@@ -2319,32 +2319,32 @@ void rtl8192_link_change(struct net_device *dev) ...@@ -2319,32 +2319,32 @@ void rtl8192_link_change(struct net_device *dev)
// RT_TRACE(COMP_CH, "========>%s(), chan:%d\n", __FUNCTION__, priv->chan); // RT_TRACE(COMP_CH, "========>%s(), chan:%d\n", __FUNCTION__, priv->chan);
// rtl8192_set_chan(dev, priv->chan); // rtl8192_set_chan(dev, priv->chan);
if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC) if (ieee->iw_mode == IW_MODE_INFRA || ieee->iw_mode == IW_MODE_ADHOC)
{ {
u32 reg = 0; u32 reg = 0;
reg = read_nic_dword(dev, RCR); reg = read_nic_dword(dev, RCR);
if (priv->ieee80211->state == IEEE80211_LINKED) if (priv->ieee80211->state == IEEE80211_LINKED)
priv->ReceiveConfig = reg |= RCR_CBSSID; priv->ReceiveConfig = reg |= RCR_CBSSID;
else else
priv->ReceiveConfig = reg &= ~RCR_CBSSID; priv->ReceiveConfig = reg &= ~RCR_CBSSID;
write_nic_dword(dev, RCR, reg); write_nic_dword(dev, RCR, reg);
} }
// rtl8192_set_rxconf(dev); // rtl8192_set_rxconf(dev);
} }
static struct ieee80211_qos_parameters def_qos_parameters = { static struct ieee80211_qos_parameters def_qos_parameters = {
{3,3,3,3},/* cw_min */ {3,3,3,3},/* cw_min */
{7,7,7,7},/* cw_max */ {7,7,7,7},/* cw_max */
{2,2,2,2},/* aifs */ {2,2,2,2},/* aifs */
{0,0,0,0},/* flags */ {0,0,0,0},/* flags */
{0,0,0,0} /* tx_op_limit */ {0,0,0,0} /* tx_op_limit */
}; };
void rtl8192_update_beacon(struct work_struct * work) void rtl8192_update_beacon(struct work_struct * work)
{ {
struct r8192_priv *priv = container_of(work, struct r8192_priv, update_beacon_wq.work); struct r8192_priv *priv = container_of(work, struct r8192_priv, update_beacon_wq.work);
struct net_device *dev = priv->ieee80211->dev; struct net_device *dev = priv->ieee80211->dev;
struct ieee80211_device* ieee = priv->ieee80211; struct ieee80211_device* ieee = priv->ieee80211;
struct ieee80211_network* net = &ieee->current_network; struct ieee80211_network* net = &ieee->current_network;
...@@ -3583,7 +3583,7 @@ TxCheckStuck(struct net_device *dev) ...@@ -3583,7 +3583,7 @@ TxCheckStuck(struct net_device *dev)
for (QueueID = 0; QueueID<=BEACON_QUEUE;QueueID ++) for (QueueID = 0; QueueID<=BEACON_QUEUE;QueueID ++)
{ {
if(QueueID == TXCMD_QUEUE) if(QueueID == TXCMD_QUEUE)
continue; continue;
#ifdef USB_TX_DRIVER_AGGREGATION_ENABLE #ifdef USB_TX_DRIVER_AGGREGATION_ENABLE
if((skb_queue_len(&priv->ieee80211->skb_waitQ[QueueID]) == 0) && (skb_queue_len(&priv->ieee80211->skb_aggQ[QueueID]) == 0) && (skb_queue_len(&priv->ieee80211->skb_drv_aggQ[QueueID]) == 0)) if((skb_queue_len(&priv->ieee80211->skb_waitQ[QueueID]) == 0) && (skb_queue_len(&priv->ieee80211->skb_aggQ[QueueID]) == 0) && (skb_queue_len(&priv->ieee80211->skb_drv_aggQ[QueueID]) == 0))
#else #else
...@@ -3591,7 +3591,7 @@ TxCheckStuck(struct net_device *dev) ...@@ -3591,7 +3591,7 @@ TxCheckStuck(struct net_device *dev)
#endif #endif
continue; continue;
bCheckFwTxCnt = true; bCheckFwTxCnt = true;
} }
// PlatformReleaseSpinLock(Adapter, RT_TX_SPINLOCK); // PlatformReleaseSpinLock(Adapter, RT_TX_SPINLOCK);
// spin_unlock_irqrestore(&priv->ieee80211->lock,flags); // spin_unlock_irqrestore(&priv->ieee80211->lock,flags);
...@@ -4110,7 +4110,7 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work) ...@@ -4110,7 +4110,7 @@ extern void rtl819x_watchdog_wqcallback(struct work_struct *work)
notify_wx_assoc_event(priv->ieee80211); notify_wx_assoc_event(priv->ieee80211);
RemovePeerTS(priv->ieee80211,priv->ieee80211->current_network.bssid); RemovePeerTS(priv->ieee80211,priv->ieee80211->current_network.bssid);
priv->ieee80211->link_change(dev); priv->ieee80211->link_change(dev);
queue_work(priv->ieee80211->wq, &priv->ieee80211->associate_procedure_wq); queue_work(priv->ieee80211->wq, &priv->ieee80211->associate_procedure_wq);
} }
} }
...@@ -4807,9 +4807,9 @@ rtl819x_evm_dbtopercentage( ...@@ -4807,9 +4807,9 @@ rtl819x_evm_dbtopercentage(
ret_val = value; ret_val = value;
if(ret_val >= 0) if(ret_val >= 0)
ret_val = 0; ret_val = 0;
if(ret_val <= -33) if(ret_val <= -33)
ret_val = -33; ret_val = -33;
ret_val = 0 - ret_val; ret_val = 0 - ret_val;
ret_val*=3; ret_val*=3;
if(ret_val == 99) if(ret_val == 99)
......
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