提交 60ef9eb6 编写于 作者: R Ramkumar Ramachandra 提交者: Greg Kroah-Hartman

Staging: rtl8192e: Cleanup style and whitespace

Replace C99-style comments with C89-style comments, fix some typos,
and fix whitespace to use only tabs.
Signed-off-by: NRamkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 4d9db977
...@@ -69,7 +69,7 @@ static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee) ...@@ -69,7 +69,7 @@ static inline int ieee80211_networks_allocate(struct ieee80211_device *ieee)
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);
return -ENOMEM; return -ENOMEM;
} }
...@@ -99,7 +99,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv) ...@@ -99,7 +99,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
{ {
struct ieee80211_device *ieee; struct ieee80211_device *ieee;
struct net_device *dev; struct net_device *dev;
int i,err; int i, err;
IEEE80211_DEBUG_INFO("Initializing...\n"); IEEE80211_DEBUG_INFO("Initializing...\n");
...@@ -111,7 +111,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv) ...@@ -111,7 +111,7 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
ieee = netdev_priv(dev); ieee = netdev_priv(dev);
memset(ieee, 0, sizeof(struct ieee80211_device)+sizeof_priv); memset(ieee, 0, sizeof(struct ieee80211_device) + sizeof_priv);
ieee->dev = dev; ieee->dev = dev;
err = ieee80211_networks_allocate(ieee); err = ieee80211_networks_allocate(ieee);
...@@ -142,7 +142,8 @@ struct net_device *alloc_ieee80211(int sizeof_priv) ...@@ -142,7 +142,8 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
spin_lock_init(&ieee->wpax_suitlist_lock); spin_lock_init(&ieee->wpax_suitlist_lock);
spin_lock_init(&ieee->bw_spinlock); spin_lock_init(&ieee->bw_spinlock);
spin_lock_init(&ieee->reorder_spinlock); spin_lock_init(&ieee->reorder_spinlock);
//added by WB
/* added by WB */
atomic_set(&(ieee->atm_chnlop), 0); atomic_set(&(ieee->atm_chnlop), 0);
atomic_set(&(ieee->atm_swbw), 0); atomic_set(&(ieee->atm_swbw), 0);
...@@ -153,8 +154,8 @@ struct net_device *alloc_ieee80211(int sizeof_priv) ...@@ -153,8 +154,8 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
ieee->privacy_invoked = 0; ieee->privacy_invoked = 0;
ieee->ieee802_1x = 1; ieee->ieee802_1x = 1;
ieee->raw_tx = 0; ieee->raw_tx = 0;
//ieee->hwsec_support = 1; //default support hw security. //use module_param instead. /* ieee->hwsec_support = 1; default support hw security: use module_param instead */
ieee->hwsec_active = 0; //disable hwsec, switch it on when necessary. ieee->hwsec_active = 0; /* disable hwsec, switch it on when necessary */
ieee80211_softmac_init(ieee); ieee80211_softmac_init(ieee);
...@@ -165,25 +166,25 @@ struct net_device *alloc_ieee80211(int sizeof_priv) ...@@ -165,25 +166,25 @@ struct net_device *alloc_ieee80211(int sizeof_priv)
return NULL; return NULL;
} }
HTUpdateDefaultSetting(ieee); HTUpdateDefaultSetting(ieee);
HTInitializeHTInfo(ieee); //may move to other place. HTInitializeHTInfo(ieee); /* may move to other place */
TSInitialize(ieee); TSInitialize(ieee);
for (i = 0; i < IEEE_IBSS_MAC_HASH_SIZE; i++) for (i = 0; i < IEEE_IBSS_MAC_HASH_SIZE; i++)
INIT_LIST_HEAD(&ieee->ibss_mac_hash[i]); INIT_LIST_HEAD(&ieee->ibss_mac_hash[i]);
for (i = 0; i < 17; i++) { for (i = 0; i < 17; i++) {
ieee->last_rxseq_num[i] = -1; ieee->last_rxseq_num[i] = -1;
ieee->last_rxfrag_num[i] = -1; ieee->last_rxfrag_num[i] = -1;
ieee->last_packet_time[i] = 0; ieee->last_packet_time[i] = 0;
} }
//These function were added to load crypte module autoly /* Functions to load crypt module automatically */
ieee80211_tkip_null(); ieee80211_tkip_null();
ieee80211_wep_null(); ieee80211_wep_null();
ieee80211_ccmp_null(); ieee80211_ccmp_null();
return dev; return dev;
failed: failed:
if (dev) if (dev)
free_netdev(dev); free_netdev(dev);
return NULL; return NULL;
...@@ -222,35 +223,35 @@ void free_ieee80211(struct net_device *dev) ...@@ -222,35 +223,35 @@ void free_ieee80211(struct net_device *dev)
u32 ieee80211_debug_level = 0; u32 ieee80211_debug_level = 0;
static int debug = \ static int debug = \
// IEEE80211_DL_INFO | /* IEEE80211_DL_INFO | */
// IEEE80211_DL_WX | /* IEEE80211_DL_WX | */
// IEEE80211_DL_SCAN | /* IEEE80211_DL_SCAN | */
// IEEE80211_DL_STATE | /* IEEE80211_DL_STATE | */
// IEEE80211_DL_MGMT | /* IEEE80211_DL_MGMT | */
// IEEE80211_DL_FRAG | /* IEEE80211_DL_FRAG | */
// IEEE80211_DL_EAP | /* IEEE80211_DL_EAP | */
// IEEE80211_DL_DROP | /* IEEE80211_DL_DROP | */
// IEEE80211_DL_TX | /* IEEE80211_DL_TX | */
// IEEE80211_DL_RX | /* IEEE80211_DL_RX | */
//IEEE80211_DL_QOS | /* IEEE80211_DL_QOS | */
// IEEE80211_DL_HT | /* IEEE80211_DL_HT | */
// IEEE80211_DL_TS | /* IEEE80211_DL_TS | */
// IEEE80211_DL_BA | /* IEEE80211_DL_BA | */
// IEEE80211_DL_REORDER| /* IEEE80211_DL_REORDER | */
// IEEE80211_DL_TRACE | /* IEEE80211_DL_TRACE | */
//IEEE80211_DL_DATA | /* IEEE80211_DL_DATA | */
IEEE80211_DL_ERR //awayls open this flags to show error out IEEE80211_DL_ERR /* always open this flag to show error out */
; ;
struct proc_dir_entry *ieee80211_proc = NULL; struct proc_dir_entry *ieee80211_proc = NULL;
static int show_debug_level(char *page, char **start, off_t offset, static int show_debug_level(char *page, char **start, off_t offset,
int count, int *eof, void *data) int count, int *eof, void *data)
{ {
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 *buffer, static int store_debug_level(struct file *file, const char *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
char buf[] = "0x00000000"; char buf[] = "0x00000000";
unsigned long len = min(sizeof(buf) - 1, (u32)count); unsigned long len = min(sizeof(buf) - 1, (u32)count);
...@@ -269,7 +270,7 @@ static int store_debug_level(struct file *file, const char *buffer, ...@@ -269,7 +270,7 @@ static int store_debug_level(struct file *file, const char *buffer,
val = simple_strtoul(p, &p, 10); val = simple_strtoul(p, &p, 10);
if (p == buf) if (p == buf)
printk(KERN_INFO DRV_NAME printk(KERN_INFO DRV_NAME
": %s is not in hex or decimal form.\n", buf); ": %s is not in hex or decimal form.\n", buf);
else else
ieee80211_debug_level = val; ieee80211_debug_level = val;
...@@ -320,7 +321,7 @@ int __init ieee80211_rtl_init(void) ...@@ -320,7 +321,7 @@ int __init ieee80211_rtl_init(void)
return -EIO; return -EIO;
} }
e = create_proc_entry("debug_level", S_IFREG | S_IRUGO | S_IWUSR, e = create_proc_entry("debug_level", S_IFREG | S_IRUGO | S_IWUSR,
ieee80211_proc); ieee80211_proc);
if (!e) { if (!e) {
remove_proc_entry(DRV_NAME, init_net.proc_net); remove_proc_entry(DRV_NAME, init_net.proc_net);
ieee80211_proc = NULL; ieee80211_proc = NULL;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册