* [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines.
@ 2015-06-17 5:42 Sunghoon Cho
2015-06-17 5:42 ` [PATCH 2/5] staging: wilc1000: remove unnecessary blank line Sunghoon Cho
` (3 more replies)
0 siblings, 4 replies; 9+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: Sunghoon Cho
This patch removes the warnings reported by checkpatch.pl regarding on
the multiple blank line uses.
Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
drivers/staging/wilc1000/wilc_wfi_netdevice.h | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 2331a00..a8b1501 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -35,16 +35,12 @@
#include <linux/ip.h> /* struct iphdr */
#include <linux/tcp.h> /* struct tcphdr */
#include <linux/skbuff.h>
-
#include <linux/ieee80211.h>
#include <net/cfg80211.h>
-
#include <linux/ieee80211.h>
#include <net/cfg80211.h>
#include <net/ieee80211_radiotap.h>
#include <linux/if_arp.h>
-
-
#include <linux/in6.h>
#include <asm/checksum.h>
#include "host_interface.h"
@@ -55,8 +51,6 @@
#define FLOW_CONTROL_UPPER_THRESHOLD 256
/*iftype*/
-
-
enum stats_flags {
WILC_WFI_RX_PKT = 1 << 0,
WILC_WFI_TX_PKT = 1 << 1,
@@ -131,14 +125,11 @@ struct WILC_WFI_priv {
#ifdef WILC_P2P
struct wilc_wfi_p2pListenParams strRemainOnChanParams;
u64 u64tx_cookie;
-
#endif
bool bCfgScanning;
u32 u32RcvdChCount;
-
-
u8 au8AssociatedBss[ETH_ALEN];
struct sta_info assoc_stainfo;
struct net_device_stats stats;
@@ -180,7 +171,6 @@ typedef struct {
} struct_frame_reg;
-
#define NUM_CONCURRENT_IFC 2
typedef struct {
uint8_t aSrcAddress[ETH_ALEN];
@@ -191,8 +181,6 @@ typedef struct {
typedef struct {
int mac_status;
int wilc1000_initialized;
-
-
#if (!defined WILC_SDIO) || (defined WILC_SDIO_IRQ_GPIO)
unsigned short dev_irq_num;
#endif
@@ -224,9 +212,6 @@ typedef struct {
struct task_struct *rx_bh_thread;
struct semaphore rx_sem;
#endif
-
-
-
struct semaphore rxq_thread_started;
struct semaphore txq_thread_started;
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 2/5] staging: wilc1000: remove unnecessary blank line.
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
@ 2015-06-17 5:42 ` Sunghoon Cho
2015-06-17 5:42 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: Sunghoon Cho
This patch removes blank line which is not necesssary after an open
brace.
Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index a8b1501..7f58551 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -57,7 +57,6 @@ enum stats_flags {
};
struct WILC_WFI_stats {
-
unsigned long rx_packets;
unsigned long tx_packets;
unsigned long rx_bytes;
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters.
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
2015-06-17 5:42 ` [PATCH 2/5] staging: wilc1000: remove unnecessary blank line Sunghoon Cho
@ 2015-06-17 5:42 ` Sunghoon Cho
2015-06-18 4:16 ` Greg KH
2015-06-17 5:42 ` [PATCH 4/5] staging: wilc1000: remove prohibited spaces Sunghoon Cho
2015-06-17 5:42 ` [PATCH 5/5] staging: wilc1000: add a blank line Sunghoon Cho
3 siblings, 1 reply; 9+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: Sunghoon Cho
This removes the warnings reported by checkpatch.pl for line over 80
characters.
Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
drivers/staging/wilc1000/wilc_wfi_netdevice.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 7f58551..96e4d5c 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -77,8 +77,8 @@ struct WILC_WFI_stats {
#define num_reg_frame 2
/*
* If you use RX_BH_WORK_QUEUE on LPC3131: You may lose the first interrupt on
- * LPC3131 which is important to get the MAC start status when you are blocked inside
- * linux_wlan_firmware_download() which blocks mac_open().
+ * LPC3131 which is important to get the MAC start status when you are blocked
+ * inside linux_wlan_firmware_download() which blocks mac_open().
*/
#if defined (NM73131_0_BOARD)
#define RX_BH_TYPE RX_BH_KTHREAD
@@ -150,7 +150,8 @@ struct WILC_WFI_priv {
u8 WILC_WFI_wep_default;
u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];
u8 WILC_WFI_wep_key_len[4];
- struct net_device *real_ndev; /* The real interface that the monitor is on */
+ /* The real interface that the monitor is on */
+ struct net_device *real_ndev;
struct wilc_wfi_key *wilc_gtk[MAX_NUM_STA];
struct wilc_wfi_key *wilc_ptk[MAX_NUM_STA];
u8 wilc_groupkey;
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters.
2015-06-17 5:42 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
@ 2015-06-18 4:16 ` Greg KH
0 siblings, 0 replies; 9+ messages in thread
From: Greg KH @ 2015-06-18 4:16 UTC (permalink / raw)
To: Sunghoon Cho
Cc: devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
On Wed, Jun 17, 2015 at 02:42:34PM +0900, Sunghoon Cho wrote:
> This removes the warnings reported by checkpatch.pl for line over 80
> characters.
>
> Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
> ---
> drivers/staging/wilc1000/wilc_wfi_netdevice.h | 7 ++++---
> 1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> index 7f58551..96e4d5c 100644
> --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> @@ -77,8 +77,8 @@ struct WILC_WFI_stats {
> #define num_reg_frame 2
> /*
> * If you use RX_BH_WORK_QUEUE on LPC3131: You may lose the first interrupt on
> - * LPC3131 which is important to get the MAC start status when you are blocked inside
> - * linux_wlan_firmware_download() which blocks mac_open().
> + * LPC3131 which is important to get the MAC start status when you are blocked
> + * inside linux_wlan_firmware_download() which blocks mac_open().
> */
> #if defined (NM73131_0_BOARD)
> #define RX_BH_TYPE RX_BH_KTHREAD
> @@ -150,7 +150,8 @@ struct WILC_WFI_priv {
> u8 WILC_WFI_wep_default;
> u8 WILC_WFI_wep_key[4][WLAN_KEY_LEN_WEP104];
> u8 WILC_WFI_wep_key_len[4];
> - struct net_device *real_ndev; /* The real interface that the monitor is on */
> + /* The real interface that the monitor is on */
> + struct net_device *real_ndev;
This change doesn't work well, I'd leave it as-is.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/5] staging: wilc1000: remove prohibited spaces.
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
2015-06-17 5:42 ` [PATCH 2/5] staging: wilc1000: remove unnecessary blank line Sunghoon Cho
2015-06-17 5:42 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
@ 2015-06-17 5:42 ` Sunghoon Cho
2015-06-18 4:18 ` Greg KH
2015-06-17 5:42 ` [PATCH 5/5] staging: wilc1000: add a blank line Sunghoon Cho
3 siblings, 1 reply; 9+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: Sunghoon Cho
This patch removes the warnings on the prohibited spaces between
function name and open parenthesis.
Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 96e4d5c..3307439 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -80,9 +80,9 @@ struct WILC_WFI_stats {
* LPC3131 which is important to get the MAC start status when you are blocked
* inside linux_wlan_firmware_download() which blocks mac_open().
*/
-#if defined (NM73131_0_BOARD)
+#if defined(NM73131_0_BOARD)
#define RX_BH_TYPE RX_BH_KTHREAD
-#elif defined (PANDA_BOARD)
+#elif defined(PANDA_BOARD)
#define RX_BH_TYPE RX_BH_THREADED_IRQ
#else
#define RX_BH_TYPE RX_BH_KTHREAD
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH 4/5] staging: wilc1000: remove prohibited spaces.
2015-06-17 5:42 ` [PATCH 4/5] staging: wilc1000: remove prohibited spaces Sunghoon Cho
@ 2015-06-18 4:18 ` Greg KH
[not found] ` <CAAYiv+Yx-KzqE9UKeEO2NHJbzy8XL2z3YH5BbkXiBgXLHRhK7Q@mail.gmail.com>
0 siblings, 1 reply; 9+ messages in thread
From: Greg KH @ 2015-06-18 4:18 UTC (permalink / raw)
To: Sunghoon Cho
Cc: devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
On Wed, Jun 17, 2015 at 02:42:35PM +0900, Sunghoon Cho wrote:
> This patch removes the warnings on the prohibited spaces between
> function name and open parenthesis.
>
> Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
> ---
> drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> index 96e4d5c..3307439 100644
> --- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> +++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
> @@ -80,9 +80,9 @@ struct WILC_WFI_stats {
> * LPC3131 which is important to get the MAC start status when you are blocked
> * inside linux_wlan_firmware_download() which blocks mac_open().
> */
> -#if defined (NM73131_0_BOARD)
> +#if defined(NM73131_0_BOARD)
> #define RX_BH_TYPE RX_BH_KTHREAD
> -#elif defined (PANDA_BOARD)
> +#elif defined(PANDA_BOARD)
> #define RX_BH_TYPE RX_BH_THREADED_IRQ
> #else
> #define RX_BH_TYPE RX_BH_KTHREAD
> --
> 1.9.1
Doesn't apply properly, please rebase and resend.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 5/5] staging: wilc1000: add a blank line
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
` (2 preceding siblings ...)
2015-06-17 5:42 ` [PATCH 4/5] staging: wilc1000: remove prohibited spaces Sunghoon Cho
@ 2015-06-17 5:42 ` Sunghoon Cho
3 siblings, 0 replies; 9+ messages in thread
From: Sunghoon Cho @ 2015-06-17 5:42 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: Sunghoon Cho
This adds a blank line after struct declaration, WILC_WFI_mon_priv.
Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 3307439..42a017a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -249,6 +249,7 @@ typedef struct {
struct WILC_WFI_mon_priv {
struct net_device *real_ndev;
};
+
extern struct net_device *WILC_WFI_devs[];
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/5] staging: wilc1000: change commenting styles.
@ 2015-06-17 7:28 Sunghoon Cho
2015-06-17 7:28 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
0 siblings, 1 reply; 9+ messages in thread
From: Sunghoon Cho @ 2015-06-17 7:28 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: Sunghoon Cho
This patch changes commenting style to Linux preferred C89 style.
Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
drivers/staging/wilc1000/wilc_wlan_if.h | 721 ++++++++++++++++++--------------
1 file changed, 397 insertions(+), 324 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index ea0ec41..c7143cd 100644
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -1,17 +1,13 @@
-/* ////////////////////////////////////////////////////////////////////////// */
-/* */
-/* Copyright (c) Atmel Corporation. All rights reserved. */
-/* */
-/* Module Name: wilc_wlan_if.h */
-/* */
-/* */
-/* ///////////////////////////////////////////////////////////////////////// */
+/*
+ * Copyright (c) Atmel Corporation. All rights reserved.
+ * Module Name: wilc_wlan_if.h
+ */
#ifndef WILC_WLAN_IF_H
#define WILC_WLAN_IF_H
-/*bug 3887: [AP] Allow Management frames to be passed to the host*/
+/* bug 3887: [AP] Allow Management frames to be passed to the host */
#define WILC_AP_EXTERNAL_MLME
#define WILC_P2P
#define TCP_ENHANCEMENTS
@@ -24,11 +20,7 @@
#include "linux_wlan_common.h"
-/********************************************
- *
- * Debug Flags
- *
- ********************************************/
+/* Debug Flags */
#define N_INIT 0x00000001
#define N_ERR 0x00000002
@@ -36,31 +28,19 @@
#define N_INTR 0x00000008
#define N_RXQ 0x00000010
-/********************************************
- *
- * Host Interface Defines
- *
- ********************************************/
+/* Host Interface Defines */
#define HIF_SDIO (0)
#define HIF_SPI (1 << 0)
#define HIF_SDIO_GPIO_IRQ (1 << 2)
-/********************************************
- *
- * Tx/Rx Buffer Size Defines
- *
- ********************************************/
+/* Tx/Rx Buffer Size Defines */
#define CE_TX_BUFFER_SIZE (64 * 1024)
#define CE_RX_BUFFER_SIZE (384 * 1024)
-/********************************************
- *
- * Wlan Interface Defines
- *
- ********************************************/
+/* Wlan Interface Defines */
typedef struct {
uint32_t read_write: 1;
@@ -97,7 +77,7 @@ typedef struct {
void (*os_enter_cs)(void *);
void (*os_leave_cs)(void *);
- /*Added by Amr - BugID_4720*/
+ /* Added by Amr - BugID_4720 */
void (*os_spin_lock)(void *, unsigned long *);
void (*os_spin_unlock)(void *, unsigned long *);
@@ -146,7 +126,7 @@ typedef struct {
uint32_t tx_buffer_size;
void *txq_critical_section;
- /*Added by Amr - BugID_4720*/
+ /* Added by Amr - BugID_4720 */
void *txq_add_to_head_critical_section;
void *txq_spin_lock;
@@ -218,7 +198,7 @@ typedef struct {
int (*wlan_cfg_set)(int, uint32_t, uint8_t *, uint32_t, int, uint32_t);
int (*wlan_cfg_get)(int, uint32_t, int, uint32_t);
int (*wlan_cfg_get_value)(uint32_t, uint8_t *, uint32_t);
- /*Bug3959: transmitting mgmt frames received from host*/
+ /* Bug3959: transmitting mgmt frames received from host */
#if defined(WILC_AP_EXTERNAL_MLME) || defined(WILC_P2P)
int (*wlan_add_mgmt_to_tx_que)(void *, uint8_t *, uint32_t, wilc_tx_complete_func_t);
@@ -229,11 +209,7 @@ typedef struct {
#endif
} wilc_wlan_oup_t;
-/********************************************
- *
- * Wlan Configuration ID
- *
- ********************************************/
+/* Wlan Configuration ID */
#define MAX_SSID_LEN 33
#define MAX_RATES_SUPPORTED 12
@@ -283,15 +259,15 @@ typedef enum {
} G_OPERATING_MODE_T;
typedef enum {
- G_SHORT_PREAMBLE = 0, /* Short Preamble */
- G_LONG_PREAMBLE = 1, /* Long Preamble */
- G_AUTO_PREAMBLE = 2, /* Auto Preamble Selection */
+ G_SHORT_PREAMBLE = 0, /* Short Preamble */
+ G_LONG_PREAMBLE = 1, /* Long Preamble */
+ G_AUTO_PREAMBLE = 2, /* Auto Preamble Selection */
} G_PREAMBLE_T;
#define MAC_CONNECTED 1
#define MAC_DISCONNECTED 0
-/*bug3819: */
+/* bug3819: */
#define SCAN_DONE TRUE
typedef enum {
PASSIVE_SCAN = 0,
@@ -328,10 +304,10 @@ typedef enum {
WEP_104 = 0x7,
WPA_AES = 0x29,
WPA_TKIP = 0x49,
- WPA_AES_TKIP = 0x69, /* Aes or Tkip */
+ WPA_AES_TKIP = 0x69, /* Aes or Tkip */
WPA2_AES = 0x31,
WPA2_TKIP = 0x51,
- WPA2_AES_TKIP = 0x71, /* Aes or Tkip */
+ WPA2_AES_TKIP = 0x71, /* Aes or Tkip */
} SECURITY_T;
typedef enum {
@@ -383,11 +359,11 @@ typedef enum {
} CH_FILTER_T;
typedef enum {
- AUTO_PROT = 0, /* Auto */
- NO_PROT, /* Do not use any protection */
- ERP_PROT, /* Protect all ERP frame exchanges */
- HT_PROT, /* Protect all HT frame exchanges */
- GF_PROT, /* Protect all GF frame exchanges */
+ AUTO_PROT = 0, /* Auto */
+ NO_PROT, /* Do not use any protection */
+ ERP_PROT, /* Protect all ERP frame exchanges */
+ HT_PROT, /* Protect all HT frame exchanges */
+ GF_PROT, /* Protect all GF frame exchanges */
} N_PROTECTION_MODE_T;
typedef enum {
@@ -409,16 +385,16 @@ typedef enum {
} N_OBSS_DETECTION_T;
typedef enum {
- RTS_CTS_NONHT_PROT = 0, /* RTS-CTS at non-HT rate */
- FIRST_FRAME_NONHT_PROT, /* First frame at non-HT rate */
- LSIG_TXOP_PROT, /* LSIG TXOP Protection */
- FIRST_FRAME_MIXED_PROT, /* First frame at Mixed format */
+ RTS_CTS_NONHT_PROT = 0, /* RTS-CTS at non-HT rate */
+ FIRST_FRAME_NONHT_PROT, /* First frame at non-HT rate */
+ LSIG_TXOP_PROT, /* LSIG TXOP Protection */
+ FIRST_FRAME_MIXED_PROT, /* First frame at Mixed format */
} N_PROTECTION_TYPE_T;
typedef enum {
STATIC_MODE = 1,
DYNAMIC_MODE = 2,
- MIMO_MODE = 3, /* power save disable */
+ MIMO_MODE = 3, /* power save disable */
} N_SMPS_MODE_T;
typedef enum {
@@ -448,342 +424,428 @@ typedef enum {
WID_NIL = 0xffff,
- /* BSS Type */
- /* -------------------------------------------------------------- */
- /* Configuration : Infrastructure Independent Access Point */
- /* Values to set : 0 1 2 */
- /* -------------------------------------------------------------- */
+ /*
+ * BSS Type
+ * --------------------------------------------------------------
+ * Configuration : Infrastructure Independent Access Point
+ * Values to set : 0 1 2
+ * --------------------------------------------------------------
+ */
WID_BSS_TYPE = 0x0000,
- /* Transmit Rate */
- /* -------------------------------------------------------------- */
- /* Configuration : 1 2 5.5 11 6 9 12 18 24 36 48 54 */
- /* Values to set : 1 2 5 11 6 9 12 18 24 36 48 54 */
- /* -------------------------------------------------------------- */
+ /*
+ * Transmit Rate
+ * --------------------------------------------------------------
+ * Configuration : 1 2 5.5 11 6 9 12 18 24 36 48 54
+ * Values to set : 1 2 5 11 6 9 12 18 24 36 48 54
+ * --------------------------------------------------------------
+ */
WID_CURRENT_TX_RATE = 0x0001,
- /* Channel */
- /* ------------------------------------------------------------------- */
- /* Configuration(g) : 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
- /* Values to set : 1 2 3 4 5 6 7 8 9 10 11 12 13 14 */
- /* -------------------------------------------------------------------- */
+ /*
+ * Channel
+ * -------------------------------------------------------------------
+ * Configuration(g) : 1 2 3 4 5 6 7 8 9 10 11 12 13 14
+ * Values to set : 1 2 3 4 5 6 7 8 9 10 11 12 13 14
+ * -------------------------------------------------------------------
+ */
WID_CURRENT_CHANNEL = 0x0002,
- /* Preamble */
- /* -------------------------------------------------------------- */
- /* Configuration : short long Auto */
- /* Values to set : 0 1 2 */
- /* -------------------------------------------------------------- */
+ /*
+ * Preamble
+ * --------------------------------------------------------------
+ * Configuration : short long Auto
+ * Values to set : 0 1 2
+ * --------------------------------------------------------------
+ */
WID_PREAMBLE = 0x0003,
- /* 11g operating mode (ignored if 11g not present) */
- /* -------------------------------------------------------------- */
- /* Configuration : HighPerf Compat(RSet #1) Compat(RSet #2) */
- /* Values to set : 1 2 3 */
- /* -------------------------------------------------------------- */
+ /*
+ * 11g operating mode (ignored if 11g not present)
+ * --------------------------------------------------------------
+ * Configuration : HighPerf Compat(RSet #1) Compat(RSet #2)
+ * Values to set : 1 2 3
+ * --------------------------------------------------------------
+ */
WID_11G_OPERATING_MODE = 0x0004,
- /* Mac status (response only) */
- /* -------------------------------------------------------------- */
- /* Configuration : disconnect connect */
- /* Values to get : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * Mac status (response only)
+ * --------------------------------------------------------------
+ * Configuration : disconnect connect
+ * Values to get : 0 1
+ * --------------------------------------------------------------
+ */
WID_STATUS = 0x0005,
- /* Scan type */
- /* -------------------------------------------------------------- */
- /* Configuration : Passive Scanning Active Scanning */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * Scan type
+ * --------------------------------------------------------------
+ * Configuration : Passive Scanning Active Scanning
+ * Values to set : 0 1
+ * --------------------------------------------------------------
+ */
WID_SCAN_TYPE = 0x0007,
- /* Key Id (WEP default key Id) */
- /* -------------------------------------------------------------- */
- /* Configuration : Any value between 0 to 3 */
- /* Values to set : Same value. Default is 0 */
- /* -------------------------------------------------------------- */
+ /*
+ * Key Id (WEP default key Id)
+ * --------------------------------------------------------------
+ * Configuration : Any value between 0 to 3
+ * Values to set : Same value. Default is 0
+ * --------------------------------------------------------------
+ */
WID_KEY_ID = 0x0009,
- /* QoS Enable */
- /* -------------------------------------------------------------- */
- /* Configuration : QoS Disable WMM Enable */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * QoS Enable
+ * --------------------------------------------------------------
+ * Configuration : QoS Disable WMM Enable
+ * Values to set : 0 1
+ * --------------------------------------------------------------
+ */
WID_QOS_ENABLE = 0x000A,
- /* Power Management */
- /* ------------------------------------------------------------------ */
- /* Configuration : NO_POWERSAVE MIN_POWERSAVE MAX_POWERSAVE */
- /* Values to set : 0 1 2 */
- /* ------------------------------------------------------------------ */
+ /*
+ * Power Management
+ * ----------------------------------------------------------------
+ * Configuration : NO_POWERSAVE MIN_POWERSAVE MAX_POWERSAVE
+ * Values to set : 0 1 2
+ * ----------------------------------------------------------------
+ */
WID_POWER_MANAGEMENT = 0x000B,
- /* WEP/802 11I Configuration */
- /* ------------------------------------------------------------------ */
- /* Configuration : Disable WP40 WP104 WPA-AES WPA-TKIP RSN-AES RSN-TKIP */
- /* Values (0x) : 00 03 07 29 49 31 51 */
- /* */
- /* Configuration : WPA-AES+TKIP RSN-AES+TKIP */
- /* Values (0x) : 69 71 */
- /* ------------------------------------------------------------------ */
+ /*
+ * WEP/802 11I Configuration
+ * ------------------------------------------------------------------
+ * Configuration : Disable WP40 WP104 WPA-AES WPA-TKIP RSN-AES RSN-TKIP
+ * Values (0x) : 00 03 07 29 49 31 51
+ *
+ * Configuration : WPA-AES+TKIP RSN-AES+TKIP
+ * Values (0x) : 69 71
+ * ------------------------------------------------------------------
+ */
WID_11I_MODE = 0x000C,
- /* WEP Configuration: Used in BSS STA mode only when WEP is enabled */
- /* ------------------------------------------------------------------ */
- /* Configuration : Open System Shared Key Any Type | 802.1x Auth */
- /* Values (0x) : 01 02 03 | BIT2 */
- /* ------------------------------------------------------------------ */
+ /*
+ * WEP Configuration: Used in BSS STA mode only when WEP is enabled
+ * ------------------------------------------------------------------
+ * Configuration : Open System Shared Key Any Type | 802.1x Auth
+ * Values (0x) : 01 02 03 | BIT2
+ * ------------------------------------------------------------------
+ */
WID_AUTH_TYPE = 0x000D,
- /* Site Survey Type */
- /* -------------------------------------------------------------- */
- /* Configuration : Values to set */
- /* Survey 1 Channel : 0 */
- /* survey all Channels : 1 */
- /* Disable Site Survey : 2 */
- /* -------------------------------------------------------------- */
+ /*
+ * Site Survey Type
+ * --------------------------------------------------------------
+ * Configuration : Values to set
+ * Survey 1 Channel : 0
+ * survey all Channels : 1
+ * Disable Site Survey : 2
+ * --------------------------------------------------------------
+ */
WID_SITE_SURVEY = 0x000E,
- /* Listen Interval */
- /* -------------------------------------------------------------- */
- /* Configuration : Any value between 1 to 255 */
- /* Values to set : Same value. Default is 3 */
- /* -------------------------------------------------------------- */
+ /*
+ * Listen Interval
+ * --------------------------------------------------------------
+ * Configuration : Any value between 1 to 255
+ * Values to set : Same value. Default is 3
+ * --------------------------------------------------------------
+ */
WID_LISTEN_INTERVAL = 0x000F,
- /* DTIM Period */
- /* -------------------------------------------------------------- */
- /* Configuration : Any value between 1 to 255 */
- /* Values to set : Same value. Default is 3 */
- /* -------------------------------------------------------------- */
+ /*
+ * DTIM Period
+ * --------------------------------------------------------------
+ * Configuration : Any value between 1 to 255
+ * Values to set : Same value. Default is 3
+ * --------------------------------------------------------------
+ */
WID_DTIM_PERIOD = 0x0010,
- /* ACK Policy */
- /* -------------------------------------------------------------- */
- /* Configuration : Normal Ack No Ack */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * ACK Policy
+ * --------------------------------------------------------------
+ * Configuration : Normal Ack No Ack
+ * Values to set : 0 1
+ * --------------------------------------------------------------
+ */
WID_ACK_POLICY = 0x0011,
- /* Reset MAC (Set only) */
- /* -------------------------------------------------------------- */
- /* Configuration : Don't Reset Reset No Request */
- /* Values to set : 0 1 2 */
- /* -------------------------------------------------------------- */
+ /*
+ * Reset MAC (Set only)
+ * --------------------------------------------------------------
+ * Configuration : Don't Reset Reset No Request
+ * Values to set : 0 1 2
+ * --------------------------------------------------------------
+ */
WID_RESET = 0x0012,
- /* Broadcast SSID Option: Setting this will adhere to "" SSID element */
- /* ------------------------------------------------------------------ */
- /* Configuration : Enable Disable */
- /* Values to set : 1 0 */
- /* ------------------------------------------------------------------ */
+ /*
+ * Broadcast SSID Option: Setting this will adhere to "" SSID element
+ * ------------------------------------------------------------------
+ * Configuration : Enable Disable
+ * Values to set : 1 0
+ * ------------------------------------------------------------------
+ */
WID_BCAST_SSID = 0x0015,
- /* Disconnect (Station) */
- /* ------------------------------------------------------------------ */
- /* Configuration : Association ID */
- /* Values to set : Association ID */
- /* ------------------------------------------------------------------ */
+ /*
+ * Disconnect (Station)
+ * ------------------------------------------------------------------
+ * Configuration : Association ID
+ * Values to set : Association ID
+ * ------------------------------------------------------------------
+ */
WID_DISCONNECT = 0x0016,
- /* 11a Tx Power Level */
- /* -------------------------------------------------------------------- */
- /* Configuration : Sets TX Power (Higher the value greater the power) */
- /* Values to set : Any value between 0 and 63 (inclusive; Default is 48)*/
- /* -------------------------------------------------------------------- */
+ /*
+ * 11a Tx Power Level
+ * --------------------------------------------------------------------
+ * Configuration : Sets TX Power (Higher the value greater the power)
+ * Values to set : Any value between 0 and 63 (inclusive; Default is 48)
+ * --------------------------------------------------------------------
+ */
WID_TX_POWER_LEVEL_11A = 0x0018,
- /* Group Key Update Policy Selection */
- /* -------------------------------------------------------------------- */
- /* Configuration : Disabled timeBased packetBased timePacketBased */
- /* Values to set : 1 2 3 4 */
- /* -------------------------------------------------------------------- */
+ /*
+ * Group Key Update Policy Selection
+ * --------------------------------------------------------------------
+ * Configuration : Disabled timeBased packetBased timePacketBased
+ * Values to set : 1 2 3 4
+ * --------------------------------------------------------------------
+ */
WID_REKEY_POLICY = 0x0019,
- /* Allow Short Slot */
- /* -------------------------------------------------------------- */
- /* Configuration : Disallow Short Slot Allow Short Slot */
- /* (Enable Only Long Slot) (Enable Short Slot if applicable)*/
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * Allow Short Slot
+ * --------------------------------------------------------------
+ * Configuration : Disallow Short Slot Allow Short Slot
+ * (Enable Only Long Slot) (Enable Short Slot if applicable)
+ * Values to set : 0 1
+ * --------------------------------------------------------------
+ */
WID_SHORT_SLOT_ALLOWED = 0x001A,
WID_PHY_ACTIVE_REG = 0x001B,
- /* 11b Tx Power Level */
- /* -------------------------------------------------------------------- */
- /* Configuration : Sets TX Power (Higher the value greater the power) */
- /* Values to set : Any value between 0 and 63 (inclusive; Default is 48)*/
- /* -------------------------------------------------------------------- */
+ /*
+ * 11b Tx Power Level
+ * --------------------------------------------------------------------
+ * Configuration : Sets TX Power (Higher the value greater the power)
+ * Values to set : Any value between 0 and 63 (inclusive; Default is 48)
+ * --------------------------------------------------------------------
+ */
WID_TX_POWER_LEVEL_11B = 0x001D,
- /* Scan Request */
- /* -------------------------------------------------------------------- */
- /* Configuration : Request default scan */
- /* Values to set : 0 */
- /* -------------------------------------------------------------------- */
+ /*
+ * Scan Request
+ * --------------------------------------------------------------------
+ * Configuration : Request default scan
+ * Values to set : 0
+ * --------------------------------------------------------------------
+ */
WID_START_SCAN_REQ = 0x001E,
- /* Rssi (get only) */
- /* -------------------------------------------------------------------- */
- /* Configuration : */
- /* Values to get : Rssi value */
- /* -------------------------------------------------------------------- */
+ /*
+ * Rssi (get only)
+ * --------------------------------------------------------------------
+ * Configuration :
+ * Values to get : Rssi value
+ * --------------------------------------------------------------------
+ */
WID_RSSI = 0x001F,
- /* Join Request */
- /* -------------------------------------------------------------------- */
- /* Configuration : Request to join */
- /* Values to set : index of scan result */
- /* -------------------------------------------------------------------- */
+ /*
+ * Join Request
+ * --------------------------------------------------------------------
+ * Configuration : Request to join
+ * Values to set : index of scan result
+ * --------------------------------------------------------------------
+ */
WID_JOIN_REQ = 0x0020,
WID_LINKSPEED = 0x0026,
- /* Enable User Control of TX Power */
- /* -------------------------------------------------------------------- */
- /* Configuration : Disable Enable */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------------- */
+ /*
+ * Enable User Control of TX Power
+ * --------------------------------------------------------------------
+ * Configuration : Disable Enable
+ * Values to set : 0 1
+ * --------------------------------------------------------------------
+ */
WID_USER_CONTROL_ON_TX_POWER = 0x0027,
WID_MEMORY_ACCESS_8BIT = 0x0029,
- /* Enable Auto RX Sensitivity feature */
- /* -------------------------------------------------------------------- */
- /* Configuration : Disable Enable */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------------- */
+ /*
+ * Enable Auto RX Sensitivity feature
+ * --------------------------------------------------------------------
+ * Configuration : Disable Enable
+ * Values to set : 0 1
+ * --------------------------------------------------------------------
+ */
WID_AUTO_RX_SENSITIVITY = 0x0032,
- /* Receive Buffer Based Ack */
- /* -------------------------------------------------------------------- */
- /* Configuration : Disable Enable */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------------- */
+ /*
+ * Receive Buffer Based Ack
+ * --------------------------------------------------------------------
+ * Configuration : Disable Enable
+ * Values to set : 0 1
+ * --------------------------------------------------------------------
+ */
WID_DATAFLOW_CONTROL = 0x0033,
- /* Scan Filter */
- /* -------------------------------------------------------------------- */
- /* Configuration : Class No filter AP only Station Only */
- /* Values to set : 0 1 2 */
- /* Configuration : Priority High Rssi Low Rssi Detect */
- /* Values to set : 0 0x4 0x08 */
- /* Configuration : Channel filter off filter on */
- /* Values to set : 0 0x10 */
- /* -------------------------------------------------------------------- */
+ /*
+ * Scan Filter
+ * --------------------------------------------------------------------
+ * Configuration : Class No filter AP only Station Only
+ * Values to set : 0 1 2
+ * Configuration : Priority High Rssi Low Rssi Detect
+ * Values to set : 0 0x4 0x08
+ * Configuration : Channel filter off filter on
+ * Values to set : 0 0x10
+ * --------------------------------------------------------------------
+ */
WID_SCAN_FILTER = 0x0036,
- /* Link Loss Threshold (measure in the beacon period) */
- /* -------------------------------------------------------------------- */
- /* Configuration : Any value between 10 and 254 (Set to 255 to disable it) */
- /* Values to set : Same value. Default is 10 */
- /* -------------------------------------------------------------------- */
+ /*
+ * Link Loss Threshold (measure in the beacon period)
+ * --------------------------------------------------------------------
+ * Configuration : Any value between 10 and 254 (Set to 255 to disable it)
+ * Values to set : Same value. Default is 10
+ * --------------------------------------------------------------------
+ */
WID_LINK_LOSS_THRESHOLD = 0x0037,
- /*BugID_4978*/
+ /* BugID_4978 */
WID_ABORT_RUNNING_SCAN = 0x003E,
/* NMAC Character WID list */
WID_WPS_START = 0x0043,
- /* Protection mode for MAC */
- /* -------------------------------------------------------------- */
- /* Configuration : Auto No protection ERP HT GF */
- /* Values to set : 0 1 2 3 4 */
- /* -------------------------------------------------------------- */
+ /*
+ * Protection mode for MAC
+ * --------------------------------------------------------------
+ * Configuration : Auto No protection ERP HT GF
+ * Values to set : 0 1 2 3 4
+ * --------------------------------------------------------------
+ */
WID_11N_PROT_MECH = 0x0080,
- /* ERP Protection type for MAC */
- /* -------------------------------------------------------------- */
- /* Configuration : Self-CTS RTS-CTS */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * ERP Protection type for MAC
+ * --------------------------------------------------------------
+ * Configuration : Self-CTS RTS-CTS
+ * Values to set : 0 1
+ * --------------------------------------------------------------
+ */
WID_11N_ERP_PROT_TYPE = 0x0081,
- /* HT Option Enable */
- /* -------------------------------------------------------------- */
- /* Configuration : HT Enable HT Disable */
- /* Values to set : 1 0 */
- /* -------------------------------------------------------------- */
+ /*
+ * HT Option Enable
+ * --------------------------------------------------------------
+ * Configuration : HT Enable HT Disable
+ * Values to set : 1 0
+ * --------------------------------------------------------------
+ */
WID_11N_ENABLE = 0x0082,
- /* 11n Operating mode (Note that 11g operating mode will also be */
- /* used in addition to this, if this is set to HT Mixed mode) */
- /* -------------------------------------------------------------- */
- /* Configuration : HT Mixed HT Only-20MHz HT Only-20/40MHz */
- /* Values to set : 1 2 3 */
- /* -------------------------------------------------------------- */
+ /*
+ * 11n Operating mode (Note that 11g operating mode will also be
+ * used in addition to this, if this is set to HT Mixed mode)
+ * --------------------------------------------------------------
+ * Configuration : HT Mixed HT Only-20MHz HT Only-20/40MHz
+ * Values to set : 1 2 3
+ * --------------------------------------------------------------
+ */
WID_11N_OPERATING_MODE = 0x0083,
- /* 11n OBSS non-HT STA Detection flag */
- /* -------------------------------------------------------------- */
- /* Configuration : Do not detect */
- /* Values to set : 0 */
- /* Configuration : Detect, do not protect or report */
- /* Values to set : 1 */
- /* Configuration : Detect, protect and do not report */
- /* Values to set : 2 */
- /* Configuration : Detect, protect and report to other BSS */
- /* Values to set : 3 */
- /* -------------------------------------------------------------- */
+ /*
+ * 11n OBSS non-HT STA Detection flag
+ * --------------------------------------------------------------
+ * Configuration : Do not detect
+ * Values to set : 0
+ * Configuration : Detect, do not protect or report
+ * Values to set : 1
+ * Configuration : Detect, protect and do not report
+ * Values to set : 2
+ * Configuration : Detect, protect and report to other BSS
+ * Values to set : 3
+ * --------------------------------------------------------------
+ */
WID_11N_OBSS_NONHT_DETECTION = 0x0084,
- /* 11n HT Protection Type */
- /* -------------------------------------------------------------- */
- /* Configuration : RTS-CTS First Frame Exchange at non-HT-rate */
- /* Values to set : 0 1 */
- /* Configuration : LSIG TXOP First Frame Exchange in Mixed Fmt */
- /* Values to set : 2 3 */
- /* -------------------------------------------------------------- */
+ /*
+ * 11n HT Protection Type
+ * --------------------------------------------------------------
+ * Configuration : RTS-CTS First Frame Exchange at non-HT-rate
+ * Values to set : 0 1
+ * Configuration : LSIG TXOP First Frame Exchange in Mixed Fmt
+ * Values to set : 2 3
+ * --------------------------------------------------------------
+ */
WID_11N_HT_PROT_TYPE = 0x0085,
- /* 11n RIFS Protection Enable Flag */
- /* -------------------------------------------------------------- */
- /* Configuration : Disable Enable */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * 11n RIFS Protection Enable Flag
+ * --------------------------------------------------------------
+ * Configuration : Disable Enable
+ * Values to set : 0 1
+ * --------------------------------------------------------------
+ */
WID_11N_RIFS_PROT_ENABLE = 0x0086,
- /* SMPS Mode */
- /* -------------------------------------------------------------- */
- /* Configuration : Static Dynamic MIMO (Power Save Disabled) */
- /* Values to set : 1 2 3 */
- /* -------------------------------------------------------------- */
+ /*
+ * SMPS Mode
+ * --------------------------------------------------------------
+ * Configuration : Static Dynamic MIMO (Power Save Disabled)
+ * Values to set : 1 2 3
+ * --------------------------------------------------------------
+ */
WID_11N_SMPS_MODE = 0x0087,
- /* Current transmit MCS */
- /* -------------------------------------------------------------- */
- /* Configuration : MCS Index for data rate */
- /* Values to set : 0 to 7 */
- /* -------------------------------------------------------------- */
+ /*
+ * Current transmit MCS
+ * --------------------------------------------------------------
+ * Configuration : MCS Index for data rate
+ * Values to set : 0 to 7
+ * --------------------------------------------------------------
+ */
WID_11N_CURRENT_TX_MCS = 0x0088,
WID_11N_PRINT_STATS = 0x0089,
- /* 11n Short GI Enable Flag */
- /* -------------------------------------------------------------- */
- /* Configuration : Disable Enable */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * 11n Short GI Enable Flag
+ * --------------------------------------------------------------
+ * Configuration : Disable Enable
+ * Values to set : 0 1
+ * --------------------------------------------------------------
+ */
WID_11N_SHORT_GI_ENABLE = 0x008D,
- /* 11n RIFS Enable Flag */
- /* -------------------------------------------------------------- */
- /* Configuration : Disable Enable */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * 11n RIFS Enable Flag
+ * --------------------------------------------------------------
+ * Configuration : Disable Enable
+ * Values to set : 0 1
+ * --------------------------------------------------------------
+ */
WID_RIFS_MODE = 0x0094,
- /* TX Abort Feature */
- /* -------------------------------------------------------------- */
- /* Configuration : Disable Self CTS Enable Self CTS */
- /* Values to set : 0 1 */
- /* Configuration : Disable TX Abort Enable TX Abort */
- /* Values to set : 2 3 */
- /* Configuration : Enable HW TX Abort Enable SW TX Abort */
- /* Values to set : 4 5 */
- /* -------------------------------------------------------------- */
+ /*
+ * TX Abort Feature
+ * --------------------------------------------------------------
+ * Configuration : Disable Self CTS Enable Self CTS
+ * Values to set : 0 1
+ * Configuration : Disable TX Abort Enable TX Abort
+ * Values to set : 2 3
+ * Configuration : Enable HW TX Abort Enable SW TX Abort
+ * Values to set : 4 5
+ * --------------------------------------------------------------
+ */
WID_TX_ABORT_CONFIG = 0x00A1,
WID_REG_TSSI_11B_VALUE = 0x00A6,
@@ -794,18 +856,22 @@ typedef enum {
WID_DSCR_TSSI_11G_VALUE = 0x00AB,
WID_DSCR_TSSI_11N_VALUE = 0x00AC,
- /* Immediate Block-Ack Support */
- /* -------------------------------------------------------------- */
- /* Configuration : Disable Enable */
- /* Values to set : 0 1 */
- /* -------------------------------------------------------------- */
+ /*
+ * Immediate Block-Ack Support
+ * --------------------------------------------------------------
+ * Configuration : Disable Enable
+ * Values to set : 0 1
+ * --------------------------------------------------------------
+ */
WID_11N_IMMEDIATE_BA_ENABLED = 0x00AF,
- /* TXOP Disable Flag */
- /* -------------------------------------------------------------- */
- /* Configuration : Disable Enable */
- /* Values to set : 1 0 */
- /* -------------------------------------------------------------- */
+ /*
+ * TXOP Disable Flag
+ * --------------------------------------------------------------
+ * Configuration : Disable Enable
+ * Values to set : 1 0
+ * --------------------------------------------------------------
+ */
WID_11N_TXOP_PROT_DISABLE = 0x00B0,
@@ -813,8 +879,8 @@ typedef enum {
/* Custom Character WID list */
WID_PC_TEST_MODE = 0x00C8,
- /*bug3819: */
- /* SCAN Complete notification WID*/
+ /* bug3819: */
+ /* SCAN Complete notification WID */
WID_SCAN_COMPLETE = 0x00C9,
#ifdef WILC_AP_EXTERNAL_MLME
@@ -822,19 +888,23 @@ typedef enum {
#endif
WID_LOGTerminal_Switch = 0x00CD,
- /* EMAC Short WID list */
- /* RTS Threshold */
- /* -------------------------------------------------------------- */
- /* Configuration : Any value between 256 to 2347 */
- /* Values to set : Same value. Default is 2347 */
- /* -------------------------------------------------------------- */
+ /*
+ * EMAC Short WID list
+ * RTS Threshold
+ * --------------------------------------------------------------
+ * Configuration : Any value between 256 to 2347
+ * Values to set : Same value. Default is 2347
+ * --------------------------------------------------------------
+ */
WID_RTS_THRESHOLD = 0x1000,
- /* Fragmentation Threshold */
- /* -------------------------------------------------------------- */
- /* Configuration : Any value between 256 to 2346 */
- /* Values to set : Same value. Default is 2346 */
- /* -------------------------------------------------------------- */
+ /*
+ * Fragmentation Threshold
+ * --------------------------------------------------------------
+ * Configuration : Any value between 256 to 2346
+ * Values to set : Same value. Default is 2346
+ * --------------------------------------------------------------
+ */
WID_FRAG_THRESHOLD = 0x1001,
WID_SHORT_RETRY_LIMIT = 0x1002,
@@ -919,10 +989,10 @@ typedef enum {
WID_REMOVE_KEY = 0x301E,
WID_ASSOC_REQ_INFO = 0x301F,
WID_ASSOC_RES_INFO = 0x3020,
- WID_MANUFACTURER = 0x3026, /*Added for CAPI tool */
- WID_MODEL_NAME = 0x3027, /*Added for CAPI tool */
- WID_MODEL_NUM = 0x3028, /*Added for CAPI tool */
- WID_DEVICE_NAME = 0x3029, /*Added for CAPI tool */
+ WID_MANUFACTURER = 0x3026, /* Added for CAPI tool */
+ WID_MODEL_NAME = 0x3027, /* Added for CAPI tool */
+ WID_MODEL_NUM = 0x3028, /* Added for CAPI tool */
+ WID_DEVICE_NAME = 0x3029, /* Added for CAPI tool */
/* NMAC String WID list */
WID_11N_P_ACTION_REQ = 0x3080,
@@ -936,9 +1006,12 @@ typedef enum {
#ifdef WILC_P2P
WID_REMAIN_ON_CHAN = 0x3996,
#endif
- /*BugID_4156*/
+ /* BugID_4156 */
WID_SSID_PROBE_REQ = 0x3997,
- /*BugID_4124 WID to trigger modified Join Request using SSID and BSSID instead of bssListIdx (used by WID_JOIN_REQ)*/
+ /*
+ * BugID_4124 WID to trigger modified Join Request using SSID and
+ * BSSID instead of bssListIdx (used by WID_JOIN_REQ)
+ */
WID_JOIN_REQ_EXTENDED = 0x3998,
/* BugID 4951: WID toset IP address in firmware */
@@ -961,12 +1034,12 @@ typedef enum {
WID_11N_AUTORATE_TABLE = 0x4080,
- /*Added here by Amr - BugID 4134*/
+ /* Added here by Amr - BugID 4134 */
WID_SCAN_CHANNEL_LIST = 0x4084,
- /*BugID_3746 WID to add IE to be added in next probe request*/
+ /* BugID_3746 WID to add IE to be added in next probe request */
WID_INFO_ELEMENT_PROBE = 0x4085,
- /*BugID_3746 WID to add IE to be added in next associate request*/
+ /* BugID_3746 WID to add IE to be added in next associate request */
WID_INFO_ELEMENT_ASSOCIATE = 0x4086,
WID_ADD_STA = 0X4087,
WID_REMOVE_STA = 0X4088,
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters
2015-06-17 7:28 [PATCH 1/5] staging: wilc1000: change commenting styles Sunghoon Cho
@ 2015-06-17 7:28 ` Sunghoon Cho
0 siblings, 0 replies; 9+ messages in thread
From: Sunghoon Cho @ 2015-06-17 7:28 UTC (permalink / raw)
To: gregkh, devel, linux-wireless, johnny.kim, chris.park, Rachel.kim,
dean.lee
Cc: Sunghoon Cho
This patch removes the warnings reported by checkpatch.pl regarding
line over 80 chracters.
Signed-off-by: Sunghoon Cho <ywhsbliss@gmail.com>
---
drivers/staging/wilc1000/wilc_wlan_if.h | 30 +++++++++++++++++++-----------
1 file changed, 19 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h b/drivers/staging/wilc1000/wilc_wlan_if.h
index 33d70c6..438e2db2 100644
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -185,7 +185,8 @@ typedef struct {
int (*wlan_firmware_download)(const uint8_t *, uint32_t);
int (*wlan_start)(void);
int (*wlan_stop)(void);
- int (*wlan_add_to_tx_que)(void *, uint8_t *, uint32_t, wilc_tx_complete_func_t);
+ int (*wlan_add_to_tx_que)(void *, uint8_t *,
+ uint32_t, wilc_tx_complete_func_t);
int (*wlan_handle_tx_que)(uint32_t *);
void (*wlan_handle_rx_que)(void);
void (*wlan_handle_rx_isr)(void);
@@ -195,10 +196,12 @@ typedef struct {
int (*wlan_cfg_get_value)(uint32_t, uint8_t *, uint32_t);
/* Bug3959: transmitting mgmt frames received from host */
#if defined(WILC_AP_EXTERNAL_MLME) || defined(WILC_P2P)
- int (*wlan_add_mgmt_to_tx_que)(void *, uint8_t *, uint32_t, wilc_tx_complete_func_t);
+ int (*wlan_add_mgmt_to_tx_que)(void *, uint8_t *,
+ uint32_t, wilc_tx_complete_func_t);
#ifdef WILC_FULLY_HOSTING_AP
- int (*wlan_add_data_to_tx_que)(void *, uint8_t *, uint32_t, wilc_tx_complete_func_t);
+ int (*wlan_add_data_to_tx_que)(void *, uint8_t *,
+ uint32_t, wilc_tx_complete_func_t);
#endif
#endif
@@ -247,10 +250,14 @@ typedef enum {
} TX_RATE_T;
typedef enum {
- B_ONLY_MODE = 0, /* basic rate: 1, 2 Mbps, otherwise: 5, 11 Mbps */
- G_ONLY_MODE, /* basic rate: 6, 12, 24 Mbps, otherwise: 9, 18, 36, 48, 54 Mbps */
- G_MIXED_11B_1_MODE, /* basic rate: 1, 2, 5.5, 11 Mbps, otherwise: all on */
- G_MIXED_11B_2_MODE, /* basic rate: 1, 2, 5, 11, 6, 12, 24 Mbps, otherwise: all on */
+ /* basic rate: 1, 2 Mbps, otherwise: 5, 11 Mbps */
+ B_ONLY_MODE = 0,
+ /* basic rate: 6, 12, 24 Mbps, otherwise: 9, 18, 36, 48, 54 Mbps */
+ G_ONLY_MODE,
+ /* basic rate: 1, 2, 5.5, 11 Mbps, otherwise: all on */
+ G_MIXED_11B_1_MODE,
+ /* basic rate: 1, 2, 5, 11, 6, 12, 24 Mbps, otherwise: all on */
+ G_MIXED_11B_2_MODE,
} G_OPERATING_MODE_T;
typedef enum {
@@ -660,7 +667,7 @@ typedef enum {
*/
WID_JOIN_REQ = 0x0020,
- WID_LINKSPEED = 0x0026,
+ WID_LINKSPEED = 0x0026,
/*
* Enable User Control of TX Power
@@ -707,7 +714,8 @@ typedef enum {
/*
* Link Loss Threshold (measure in the beacon period)
* --------------------------------------------------------------------
- * Configuration : Any value between 10 and 254 (Set to 255 to disable it)
+ * Configuration : Any value between 10 and 254
+ * (Set to 255 to disable it)
* Values to set : Same value. Default is 10
* --------------------------------------------------------------------
*/
@@ -982,9 +990,9 @@ typedef enum {
WID_ASSOC_REQ_INFO = 0x301F,
WID_ASSOC_RES_INFO = 0x3020,
WID_MANUFACTURER = 0x3026, /* Added for CAPI tool */
- WID_MODEL_NAME = 0x3027, /* Added for CAPI tool */
+ WID_MODEL_NAME = 0x3027, /* Added for CAPI tool */
WID_MODEL_NUM = 0x3028, /* Added for CAPI tool */
- WID_DEVICE_NAME = 0x3029, /* Added for CAPI tool */
+ WID_DEVICE_NAME = 0x3029, /* Added for CAPI tool */
/* NMAC String WID list */
WID_11N_P_ACTION_REQ = 0x3080,
--
1.9.1
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-06-18 14:42 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-17 5:42 [PATCH 1/5] staging: wilc1000: remove the warnings on the multiple blank lines Sunghoon Cho
2015-06-17 5:42 ` [PATCH 2/5] staging: wilc1000: remove unnecessary blank line Sunghoon Cho
2015-06-17 5:42 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
2015-06-18 4:16 ` Greg KH
2015-06-17 5:42 ` [PATCH 4/5] staging: wilc1000: remove prohibited spaces Sunghoon Cho
2015-06-18 4:18 ` Greg KH
[not found] ` <CAAYiv+Yx-KzqE9UKeEO2NHJbzy8XL2z3YH5BbkXiBgXLHRhK7Q@mail.gmail.com>
2015-06-18 14:42 ` Greg KH
2015-06-17 5:42 ` [PATCH 5/5] staging: wilc1000: add a blank line Sunghoon Cho
-- strict thread matches above, loose matches on Subject: below --
2015-06-17 7:28 [PATCH 1/5] staging: wilc1000: change commenting styles Sunghoon Cho
2015-06-17 7:28 ` [PATCH 3/5] staging: wilc1000: remove the warnings on line over 80 characters Sunghoon Cho
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.