[PATCH RESEND 11/12] staging: wilc1000: rename os_context to wilc
This patch rename os_context to wilc because it is used as struct wilc and
move os_private from struct wilc_wlan_os_context_t to struct wilc_wlan_inp_t.
Finally, delete wilc_wlan_os_context_t.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/linux_wlan.c | 2 +-
drivers/staging/wilc1000/wilc_sdio.c| 6 +++---
drivers/staging/wilc1000/wilc_spi.c | 6 +++---
drivers/staging/wilc1000/wilc_wlan_if.h | 6 +-
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 017799f..d0161cd 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1012,7 +1012,7 @@ void linux_to_wlan(wilc_wlan_inp_t *nwi, struct wilc *nic)
PRINT_D(INIT_DBG, "Linux to Wlan services ...\n");
- nwi->os_context.os_private = (void *)nic;
+ nwi->wilc = (void *)nic;
#ifdef WILC_SDIO
nwi->io_func.io_type = HIF_SDIO;
diff --git a/drivers/staging/wilc1000/wilc_sdio.c
b/drivers/staging/wilc1000/wilc_sdio.c
index 300c571..82f68eb 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -14,7 +14,7 @@
#define WILC_SDIO_BLOCK_SIZE 512
typedef struct {
- void *os_context;
+ void *wilc;
u32 block_size;
int (*sdio_cmd52)(sdio_cmd52_t *);
int (*sdio_cmd53)(sdio_cmd53_t *);
@@ -563,10 +563,10 @@ static int sdio_init(wilc_wlan_inp_t *inp,
wilc_debug_func func)
memset(&g_sdio, 0, sizeof(wilc_sdio_t));
g_sdio.dPrint = func;
- g_sdio.os_context = inp->os_context.os_private;
+ g_sdio.wilc = inp->wilc;
if (inp->io_func.io_init) {
- if (!inp->io_func.io_init(g_sdio.os_context)) {
+ if (!inp->io_func.io_init(g_sdio.wilc)) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed io init
bus...\n");
return 0;
}
diff --git a/drivers/staging/wilc1000/wilc_spi.c
b/drivers/staging/wilc1000/wilc_spi.c
index 599508b..9a72fbb 100644
--- a/drivers/staging/wilc1000/wilc_spi.c
+++ b/drivers/staging/wilc1000/wilc_spi.c
@@ -12,7 +12,7 @@
#include "wilc_wlan.h"
typedef struct {
- void *os_context;
+ void *wilc;
int (*spi_tx)(u8 *, u32);
int (*spi_rx)(u8 *, u32);
int (*spi_trx)(u8 *, u8 *, u32);
@@ -968,9 +968,9 @@ static int spi_init(wilc_wlan_inp_t *inp, wilc_debug_func
func)
memset(&g_spi, 0, sizeof(wilc_spi_t));
g_spi.dPrint = func;
- g_spi.os_context = inp->os_context.os_private;
+ g_spi.wilc = inp->wilc;
if (inp->io_func.io_init) {
- if (!inp->io_func.io_init(g_spi.os_context)) {
+ if (!inp->io_func.io_init(g_spi.wilc)) {
PRINT_ER("[wilc spi]: Failed io init bus...\n");
return 0;
}
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h
b/drivers/staging/wilc1000/wilc_wlan_if.h
index 139cc6d..a6bf969 100644
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -99,11 +99,7 @@ typedef struct {
#define WILC_MAC_INDICATE_SCAN 0x2
typedef struct {
- void *os_private;
-} wilc_wlan_os_context_t;
-
-typedef struct {
- wilc_wlan_os_context_t os_context;
+ void *wilc;
wilc_wlan_io_func_t io_func;
} wilc_wlan_inp_t;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 12/12] staging: wilc1000: add argument wilc and use it instead of g_linux_wlan
This patch adds new argument wilc to linux_sdio_cmd53 and linux_sdio_cmd52
, and use it instead of g_linux_wlan. Pass wilc to the functions as well.
The void type wilc will be changed with struct wilc when SDIO and SPI
modules are reworked.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/linux_wlan_sdio.c | 8 ++--
drivers/staging/wilc1000/linux_wlan_sdio.h | 4 +-
drivers/staging/wilc1000/wilc_sdio.c | 66 +++---
drivers/staging/wilc1000/wilc_wlan_if.h| 4 +-
4 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c
b/drivers/staging/wilc1000/linux_wlan_sdio.c
index bf05e22..8150d6f 100644
--- a/drivers/staging/wilc1000/linux_wlan_sdio.c
+++ b/drivers/staging/wilc1000/linux_wlan_sdio.c
@@ -53,9 +53,9 @@ static void wilc_sdio_interrupt(struct sdio_func *func)
}
-int linux_sdio_cmd52(sdio_cmd52_t *cmd)
+int linux_sdio_cmd52(void *wilc, sdio_cmd52_t *cmd)
{
- struct sdio_func *func = g_linux_wlan->wilc_sdio_func;
+ struct sdio_func *func = ((struct wilc*)wilc)->wilc_sdio_func;
int ret;
u8 data;
@@ -85,9 +85,9 @@ int linux_sdio_cmd52(sdio_cmd52_t *cmd)
}
-int linux_sdio_cmd53(sdio_cmd53_t *cmd)
+int linux_sdio_cmd53(void *wilc, sdio_cmd53_t *cmd)
{
- struct sdio_func *func = g_linux_wlan->wilc_sdio_func;
+ struct sdio_func *func = ((struct wilc*)wilc)->wilc_sdio_func;
int size, ret;
sdio_claim_host(func);
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.h
b/drivers/staging/wilc1000/linux_wlan_sdio.h
index 4b515f5..d4b3d12 100644
--- a/drivers/staging/wilc1000/linux_wlan_sdio.h
+++ b/drivers/staging/wilc1000/linux_wlan_sdio.h
@@ -5,8 +5,8 @@ extern struct sdio_driver wilc_bus;
int linux_sdio_init(void *);
void linux_sdio_deinit(void *);
-int linux_sdio_cmd52(sdio_cmd52_t *cmd);
-int linux_sdio_cmd53(sdio_cmd53_t *cmd);
+int linux_sdio_cmd52(void *wilc, sdio_cmd52_t *cmd);
+int linux_sdio_cmd53(void *wilc, sdio_cmd53_t *cmd);
int enable_sdio_interrupt(void);
void disable_sdio_interrupt(void);
int linux_sdio_set_max_speed(void);
diff --git a/drivers/staging/wilc1000/wilc_sdio.c
b/drivers/staging/wilc1000/wilc_sdio.c
index 82f68eb..b9ca142 100644
--- a/drivers/staging/wilc1000/wilc_sdio.c
+++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -16,8 +16,8 @@
typedef struct {
void *wilc;
u32 block_size;
- int (*sdio_cmd52)(sdio_cmd52_t *);
- int (*sdio_cmd53)(sdio_cmd53_t *);
+ int (*sdio_cmd52)(void *, sdio_cmd52_t *);
+ int (*sdio_cmd53)(void *, sdio_cmd53_t *);
int (*sdio_set_max_speed)(void);
int (*sdio_set_default_speed)(void);
wilc_debug_func dPrint;
@@ -51,21 +51,21 @@ static int sdio_set_func0_csa_address(u32 adr)
cmd.raw = 0;
cmd.address = 0x10c;
cmd.data = (u8)adr;
- if (!g_sdio.sdio_cmd52(&cmd)) {
+ if (!g_sdio.sdio_cmd52(g_sdio.wilc, &cmd)) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed cmd52, set 0x10c
data...\n");
goto _fail_;
}
cmd.address = 0x10d;
cmd.data = (u8)(adr >> 8);
- if (!g_sdio.sdio_cmd52(&cmd)) {
+ if (!g_sdio.sdio_cmd52(g_sdio.wilc, &cmd)) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed cmd52, set 0x10d
data...\n");
goto _fail_;
}
cmd.address = 0x10e;
cmd.data = (u8)(adr >> 16);
- if (!g_sdio.sdio_cmd52(&cmd)) {
+ if (!g_sdio.sdio_cmd52(g_sdio.wilc, &cmd)) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed cmd52, set 0x10e
data...\n");
goto _fail_;
}
@@ -84,14 +84,14 @@ static int sdio_set_func0_block_size(u32 block_size)
cmd.raw = 0;
cmd.address = 0x10;
cmd.data = (u8)block_size;
- if (!g_sdio.sdio_cmd52(&cmd)) {
+ if (!g_sdio.sdio_cmd52(g_sdio.wilc, &cmd)) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed cmd52, set 0x10
data...\n");
goto _fail_;
}
cmd.address = 0x11;
cmd.data = (u8)(block_size >> 8);
- if (!g_sdio.sdio_cmd52(&cmd)) {
+ if (!g_sdio.sdio_cmd52(g_sdio.wilc, &cmd)) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed cmd52, set 0x11
data...\n");
goto _fail_;
}
@@ -116,13 +116,13 @@ static int sdio_set_func1_block_size(u32 block_size)
cmd.raw = 0;
cmd.address = 0x110;
cmd.data = (u8)block_size;
- if (!g_sdio.sdio_cmd52(&cmd)) {
+ if (!g_sdio.sdio_cmd52(g_sdio.wilc, &cmd)) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed cmd52, set 0x110
data...\n");
goto _fail_;
}
cmd.address = 0x111;
cmd.data = (u8)(block_size >> 8);
- if (!g_sdio.sdio_cmd52(&cmd)) {
+ if (!g_sdio.sdio_cmd52(g_sdio.wilc, &cmd)) {
g_sdio.dPrint(N_ERR, "[wilc sdio]: Failed cmd52, set 0x111
data...\n");
goto _fai
[PATCH RESEND 08/12] staging: wilc1000: wilc_wlan_init: add argument net_device
This patch adds new argument struct net_device and pass the function dev.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/wilc_wlan.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c
b/drivers/staging/wilc1000/wilc_wlan.c
index 5a480a1..16224ce 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1870,7 +1870,7 @@ void wilc_bus_set_default_speed(void)
/* Restore bus speed to default. */
g_wlan.hif_func.hif_set_default_bus_speed();
}
-u32 init_chip(void)
+u32 init_chip(struct net_device *dev)
{
u32 chipid;
u32 reg, ret = 0;
@@ -2028,7 +2028,7 @@ int wilc_wlan_init(struct net_device *dev,
wilc_wlan_inp_t *inp)
}
#endif
- if (!init_chip()) {
+ if (!init_chip(dev)) {
/* EIO 5 */
ret = -5;
goto _fail_;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 09/12] staging: wilc1000: linux_wlan_get_firmware: change argument p_nic with dev
This patch changes argument perInterface_wlan_t *p_nic with struct net_device
*dev and use netdev private data nic and it's member wilc instead of
g_linux_wlan.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/linux_wlan.c | 17 ++---
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 +---
drivers/staging/wilc1000/wilc_wfi_netdevice.h | 1 +
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 895eb60..971b154 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -518,14 +518,17 @@ void linux_wlan_rx_complete(void)
PRINT_D(RX_DBG, "RX completed\n");
}
-int linux_wlan_get_firmware(perInterface_wlan_t *p_nic)
+int linux_wlan_get_firmware(struct net_device *dev)
{
-
- perInterface_wlan_t *nic = p_nic;
+ perInterface_wlan_t *nic;
+ struct wilc *wilc;
int ret = 0;
const struct firmware *wilc_firmware;
char *firmware;
+ nic = netdev_priv(dev);
+ wilc = nic->wilc;
+
if (nic->iftype == AP_MODE)
firmware = AP_FIRMWARE;
else if (nic->iftype == STATION_MODE)
@@ -550,19 +553,19 @@ int linux_wlan_get_firmware(perInterface_wlan_t *p_nic)
* root file system with the name specified above */
#ifdef WILC_SDIO
- if (request_firmware(&wilc_firmware, firmware,
&g_linux_wlan->wilc_sdio_func->dev) != 0) {
+ if (request_firmware(&wilc_firmware, firmware,
&wilc->wilc_sdio_func->dev) != 0) {
PRINT_ER("%s - firmare not available\n", firmware);
ret = -1;
goto _fail_;
}
#else
- if (request_firmware(&wilc_firmware, firmware,
&g_linux_wlan->wilc_spidev->dev) != 0) {
+ if (request_firmware(&wilc_firmware, firmware, &wilc->wilc_spidev->dev)
!= 0) {
PRINT_ER("%s - firmare not available\n", firmware);
ret = -1;
goto _fail_;
}
#endif
- g_linux_wlan->firmware = wilc_firmware;
+ wilc->firmware = wilc_firmware;
_fail_:
@@ -1126,7 +1129,7 @@ int wilc1000_wlan_init(struct net_device *dev,
perInterface_wlan_t *p_nic)
}
#endif
- if (linux_wlan_get_firmware(nic)) {
+ if (linux_wlan_get_firmware(dev)) {
PRINT_ER("Can't get firmware\n");
ret = -EIO;
goto _fail_irq_enable_;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index cdcf134..32b93d3 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -21,8 +21,6 @@
#define IS_MGMT_STATUS_SUCCES 0x040
#define GET_PKT_OFFSET(a) (((a) >> 22) & 0x1ff)
-extern int linux_wlan_get_firmware(perInterface_wlan_t *p_nic);
-
extern int mac_open(struct net_device *ndev);
extern int mac_close(struct net_device *ndev);
@@ -2737,7 +2735,7 @@ static int change_virtual_intf(struct wiphy *wiphy,
struct net_device *dev,
PRINT_D(CORECONFIG_DBG, "priv->hWILCWFIDrv[%p]\n",
priv->hWILCWFIDrv);
PRINT_D(HOSTAPD_DBG, "Downloading AP firmware\n");
- linux_wlan_get_firmware(nic);
+ linux_wlan_get_firmware(dev);
/*If wilc is running, then close-open to actually get new
firmware running (serves P2P)*/
if (wl->initialized){
nic->iftype = AP_MODE;
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 0bfe762..0435cb5 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -218,4 +218,5 @@ int wilc_netdev_init(struct wilc **wilc);
void wilc1000_wlan_deinit(struct net_device *dev);
void WILC_WFI_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size);
u16 Set_machw_change_vir_if(struct net_device *dev, bool bValue);
+int linux_wlan_get_firmware(struct net_device *dev);
#endif
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 10/12] staging: wilc1000: wl_wlan_cleanup: add argument struct wilc
This patch adds new argument struct wilc and use it instead of g_linux_wlan.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/linux_wlan.c | 28 +--
drivers/staging/wilc1000/linux_wlan_sdio.c| 2 +-
drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 971b154..017799f 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1652,39 +1652,39 @@ void WILC_WFI_mgmt_rx(struct wilc *wilc, u8 *buff, u32
size)
WILC_WFI_p2p_rx(wilc->vif[1].ndev, buff, size);
}
-void wl_wlan_cleanup(void)
+void wl_wlan_cleanup(struct wilc *wilc)
{
int i = 0;
perInterface_wlan_t *nic[NUM_CONCURRENT_IFC];
- if (g_linux_wlan &&
- (g_linux_wlan->vif[0].ndev || g_linux_wlan->vif[1].ndev)) {
+ if (wilc &&
+ (wilc->vif[0].ndev || wilc->vif[1].ndev)) {
unregister_inetaddr_notifier(&g_dev_notifier);
for (i = 0; i < NUM_CONCURRENT_IFC; i++)
- nic[i] = netdev_priv(g_linux_wlan->vif[i].ndev);
+ nic[i] = netdev_priv(wilc->vif[i].ndev);
}
- if (g_linux_wlan && g_linux_wlan->firmware)
- release_firmware(g_linux_wlan->firmware);
+ if (wilc && wilc->firmware)
+ release_firmware(wilc->firmware);
- if (g_linux_wlan &&
- (g_linux_wlan->vif[0].ndev || g_linux_wlan->vif[1].ndev)) {
+ if (wilc&&
+ (wilc->vif[0].ndev || wilc->vif[1].ndev)) {
linux_wlan_lock_timeout(&close_exit_sync, 12 * 1000);
for (i = 0; i < NUM_CONCURRENT_IFC; i++)
- if (g_linux_wlan->vif[i].ndev)
+ if (wilc->vif[i].ndev)
if (nic[i]->mac_opened)
- mac_close(g_linux_wlan->vif[i].ndev);
+ mac_close(wilc->vif[i].ndev);
for (i = 0; i < NUM_CONCURRENT_IFC; i++) {
- unregister_netdev(g_linux_wlan->vif[i].ndev);
- wilc_free_wiphy(g_linux_wlan->vif[i].ndev);
- free_netdev(g_linux_wlan->vif[i].ndev);
+ unregister_netdev(wilc->vif[i].ndev);
+ wilc_free_wiphy(wilc->vif[i].ndev);
+ free_netdev(wilc->vif[i].ndev);
}
}
- kfree(g_linux_wlan);
+ kfree(wilc);
#if defined(WILC_DEBUGFS)
wilc_debugfs_remove();
diff --git a/drivers/staging/wilc1000/linux_wlan_sdio.c
b/drivers/staging/wilc1000/linux_wlan_sdio.c
index 4aff953..bf05e22 100644
--- a/drivers/staging/wilc1000/linux_wlan_sdio.c
+++ b/drivers/staging/wilc1000/linux_wlan_sdio.c
@@ -146,7 +146,7 @@ static void linux_sdio_remove(struct sdio_func *func)
struct wilc_sdio *wl_sdio;
wl_sdio = sdio_get_drvdata(func);
- wl_wlan_cleanup();
+ wl_wlan_cleanup(wl_sdio->wilc);
kfree(wl_sdio);
}
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 0435cb5..07917ea 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -213,7 +213,7 @@ void linux_wlan_mac_indicate(struct wilc *wilc, int flag);
void linux_wlan_rx_complete(void);
void linux_wlan_dbg(u8 *buff);
int linux_wlan_lock_timeout(void *vp, u32 timeout);
-void wl_wlan_cleanup(void);
+void wl_wlan_cleanup(struct wilc *wilc);
int wilc_netdev_init(struct wilc **wilc);
void wilc1000_wlan_deinit(struct net_device *dev);
void WILC_WFI_mgmt_rx(struct wilc *wilc, u8 *buff, u32 size);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 05/12] staging: wilc1000: wilc_wlan_txq_add_to_tail: add argument net_device
This patch adds new argument dev and use netdev private data member wilc
instead of g_linux_wlan, pass the function dev also.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/wilc_wlan.c | 19 +--
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c
b/drivers/staging/wilc1000/wilc_wlan.c
index 3dc0a80..03593b7 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -190,11 +190,18 @@ wilc_wlan_txq_remove_from_head(struct net_device *dev)
return tqe;
}
-static void wilc_wlan_txq_add_to_tail(struct txq_entry_t *tqe)
+static void wilc_wlan_txq_add_to_tail(struct net_device *dev,
+ struct txq_entry_t *tqe)
{
wilc_wlan_dev_t *p = &g_wlan;
unsigned long flags;
- spin_lock_irqsave(&g_linux_wlan->txq_spinlock, flags);
+ perInterface_wlan_t *nic;
+ struct wilc *wilc;
+
+ nic = netdev_priv(dev);
+ wilc = nic->wilc;
+
+ spin_lock_irqsave(&wilc->txq_spinlock, flags);
if (p->txq_head == NULL) {
tqe->next = NULL;
@@ -210,14 +217,14 @@ static void wilc_wlan_txq_add_to_tail(struct txq_entry_t
*tqe)
p->txq_entries += 1;
PRINT_D(TX_DBG, "Number of entries in TxQ = %d\n", p->txq_entries);
- spin_unlock_irqrestore(&g_linux_wlan->txq_spinlock, flags);
+ spin_unlock_irqrestore(&wilc->txq_spinlock, flags);
/**
* wake up TX queue
**/
PRINT_D(TX_DBG, "Wake the txq_handling\n");
- up(&g_linux_wlan->txq_event);
+ up(&wilc->txq_event);
}
static int wilc_wlan_txq_add_to_head(struct txq_entry_t *tqe)
@@ -538,7 +545,7 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void
*priv, u8 *buffer,
if (is_TCP_ACK_Filter_Enabled())
tcp_process(dev, tqe);
#endif
- wilc_wlan_txq_add_to_tail(tqe);
+ wilc_wlan_txq_add_to_tail(dev, tqe);
/*return number of itemes in the queue*/
return p->txq_entries;
}
@@ -566,7 +573,7 @@ int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void
*priv, u8 *buffer,
tqe->tcp_PendingAck_index = NOT_TCP_ACK;
#endif
PRINT_D(TX_DBG, "Adding Network packet at the Queue tail\n");
- wilc_wlan_txq_add_to_tail(tqe);
+ wilc_wlan_txq_add_to_tail(dev, tqe);
return 1;
}
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 07/12] staging: wilc1000: wilc_wlan_init: add argument struct net_device
This patch adds an argument dev and pass dev to the function.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/linux_wlan.c | 2 +-
drivers/staging/wilc1000/wilc_wlan.c| 2 +-
drivers/staging/wilc1000/wilc_wlan_if.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 6b5f1c5..895eb60 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1096,7 +1096,7 @@ int wilc1000_wlan_init(struct net_device *dev,
perInterface_wlan_t *p_nic)
linux_to_wlan(&nwi, wl);
- ret = wilc_wlan_init(&nwi);
+ ret = wilc_wlan_init(dev, &nwi);
if (ret < 0) {
PRINT_ER("Initializing WILC_Wlan FAILED\n");
ret = -EIO;
diff --git a/drivers/staging/wilc1000/wilc_wlan.c
b/drivers/staging/wilc1000/wilc_wlan.c
index 03593b7..5a480a1 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -1951,7 +1951,7 @@ _fail_:
return chipid;
}
-int wilc_wlan_init(wilc_wlan_inp_t *inp)
+int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp)
{
int ret = 0;
diff --git a/drivers/staging/wilc1000/wilc_wlan_if.h
b/drivers/staging/wilc1000/wilc_wlan_if.h
index be972af..139cc6d 100644
--- a/drivers/staging/wilc1000/wilc_wlan_if.h
+++ b/drivers/staging/wilc1000/wilc_wlan_if.h
@@ -937,7 +937,7 @@ typedef enum {
WID_MAX = 0x
} WID_T;
-int wilc_wlan_init(wilc_wlan_inp_t *inp);
+int wilc_wlan_init(struct net_device *dev, wilc_wlan_inp_t *inp);
void wilc_bus_set_max_speed(void);
void wilc_bus_set_default_speed(void);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 01/12] staging: wilc1000: wilc_wlan_txq_get_first: add argument struct wilc
This patch adds new argument struct wilc and use it instead of g_linux_wlan.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/wilc_wlan.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c
b/drivers/staging/wilc1000/wilc_wlan.c
index c026657..6c7cbd1 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -563,17 +563,17 @@ int wilc_wlan_txq_add_mgmt_pkt(void *priv, u8 *buffer,
u32 buffer_size, wilc_tx_
return 1;
}
-static struct txq_entry_t *wilc_wlan_txq_get_first(void)
+static struct txq_entry_t *wilc_wlan_txq_get_first(struct wilc *wilc)
{
wilc_wlan_dev_t *p = &g_wlan;
struct txq_entry_t *tqe;
unsigned long flags;
- spin_lock_irqsave(&g_linux_wlan->txq_spinlock, flags);
+ spin_lock_irqsave(&wilc->txq_spinlock, flags);
tqe = p->txq_head;
- spin_unlock_irqrestore(&g_linux_wlan->txq_spinlock, flags);
+ spin_unlock_irqrestore(&wilc->txq_spinlock, flags);
return tqe;
@@ -855,7 +855,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32
*pu32TxqCount)
* build the vmm list
**/
PRINT_D(TX_DBG, "Getting the head of the TxQ\n");
- tqe = wilc_wlan_txq_get_first();
+ tqe = wilc_wlan_txq_get_first(wilc);
i = 0;
sum = 0;
do {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 06/12] staging: wilc1000: linux_wlan_start_firmware: change argument with dev
This patch changes argument nic with dev and use netdev private data member
wilc instead of g_linux_wlan, and pass dev to the function as well.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/linux_wlan.c | 13 +
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 69d2839..6b5f1c5 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -570,10 +570,15 @@ _fail_:
}
-static int linux_wlan_start_firmware(perInterface_wlan_t *nic)
+static int linux_wlan_start_firmware(struct net_device *dev)
{
-
+ perInterface_wlan_t *nic;
+ struct wilc *wilc;
int ret = 0;
+
+ nic = netdev_priv(dev);
+ wilc = nic->wilc;
+
/* start firmware */
PRINT_D(INIT_DBG, "Starting Firmware ...\n");
ret = wilc_wlan_start();
@@ -584,7 +589,7 @@ static int linux_wlan_start_firmware(perInterface_wlan_t
*nic)
/* wait for mac ready */
PRINT_D(INIT_DBG, "Waiting for Firmware to get ready ...\n");
- ret = linux_wlan_lock_timeout(&g_linux_wlan->sync_event, 5000);
+ ret = linux_wlan_lock_timeout(&wilc->sync_event, 5000);
if (ret) {
PRINT_D(INIT_DBG, "Firmware start timed out");
goto _fail_;
@@ -1136,7 +1141,7 @@ int wilc1000_wlan_init(struct net_device *dev,
perInterface_wlan_t *p_nic)
}
/* Start firmware*/
- ret = linux_wlan_start_firmware(nic);
+ ret = linux_wlan_start_firmware(dev);
if (ret < 0) {
PRINT_ER("Failed to start firmware\n");
ret = -EIO;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 02/12] staging: wilc1000: linux_wlan_firmware_download: change argument
This patch changes argument p_nic with wilc and use it instead of
g_linux_wlan. Pass argument dev to the function.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/linux_wlan.c | 18 +++---
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_wlan.c
b/drivers/staging/wilc1000/linux_wlan.c
index 2a5b36f..69d2839 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -598,12 +598,16 @@ static int linux_wlan_start_firmware(perInterface_wlan_t
*nic)
_fail_:
return ret;
}
-static int linux_wlan_firmware_download(struct wilc *p_nic)
+static int linux_wlan_firmware_download(struct net_device *dev)
{
-
+ perInterface_wlan_t *nic;
+ struct wilc *wilc;
int ret = 0;
- if (!g_linux_wlan->firmware) {
+ nic = netdev_priv(dev);
+ wilc = nic->wilc;
+
+ if (!wilc->firmware) {
PRINT_ER("Firmware buffer is NULL\n");
ret = -ENOBUFS;
goto _FAIL_;
@@ -612,15 +616,15 @@ static int linux_wlan_firmware_download(struct wilc
*p_nic)
* do the firmware download
**/
PRINT_D(INIT_DBG, "Downloading Firmware ...\n");
- ret = wilc_wlan_firmware_download(g_linux_wlan->firmware->data,
- g_linux_wlan->firmware->size);
+ ret = wilc_wlan_firmware_download(wilc->firmware->data,
+ wilc->firmware->size);
if (ret < 0)
goto _FAIL_;
/* Freeing FW buffer */
PRINT_D(INIT_DBG, "Freeing FW buffer ...\n");
PRINT_D(INIT_DBG, "Releasing firmware\n");
- release_firmware(g_linux_wlan->firmware);
+ release_firmware(wilc->firmware);
PRINT_D(INIT_DBG, "Download Succeeded\n");
@@ -1124,7 +1128,7 @@ int wilc1000_wlan_init(struct net_device *dev,
perInterface_wlan_t *p_nic)
}
/*Download firmware*/
- ret = linux_wlan_firmware_download(wl);
+ ret = linux_wlan_firmware_download(dev);
if (ret < 0) {
PRINT_ER("Failed to download firmware\n");
ret = -EIO;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 04/12] staging: wilc1000: wilc_wlan_txq_add_mgmt_pkt: add new argument dev
This patch adds new argument struct net_device *dev and pass argument
struct net_device to the function.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/linux_mon.c | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++--
drivers/staging/wilc1000/wilc_wlan.c | 3 ++-
drivers/staging/wilc1000/wilc_wlan.h | 4 ++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/linux_mon.c
b/drivers/staging/wilc1000/linux_mon.c
index 450af1b..589a11f 100644
--- a/drivers/staging/wilc1000/linux_mon.c
+++ b/drivers/staging/wilc1000/linux_mon.c
@@ -195,7 +195,7 @@ static int mon_mgmt_tx(struct net_device *dev, const u8
*buf, size_t len)
mgmt_tx->size = len;
memcpy(mgmt_tx->buff, buf, len);
- wilc_wlan_txq_add_mgmt_pkt(mgmt_tx, mgmt_tx->buff, mgmt_tx->size,
+ wilc_wlan_txq_add_mgmt_pkt(dev, mgmt_tx, mgmt_tx->buff, mgmt_tx->size,
mgmt_tx_complete);
netif_wake_queue(dev);
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 4de27ef..cdcf134 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2337,8 +2337,8 @@ static int mgmt_tx(struct wiphy *wiphy,
jiffies, pstrWFIDrv->p2p_timeout);
}
- wilc_wlan_txq_add_mgmt_pkt(mgmt_tx, mgmt_tx->buff,
- mgmt_tx->size,
+ wilc_wlan_txq_add_mgmt_pkt(wdev->netdev, mgmt_tx,
+ mgmt_tx->buff, mgmt_tx->size,
WILC_WFI_mgmt_tx_complete);
} else {
PRINT_D(GENERIC_DBG, "This function transmits only management
frames\n");
diff --git a/drivers/staging/wilc1000/wilc_wlan.c
b/drivers/staging/wilc1000/wilc_wlan.c
index 5dcc4d2..3dc0a80 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -543,7 +543,8 @@ int wilc_wlan_txq_add_net_pkt(struct net_device *dev, void
*priv, u8 *buffer,
return p->txq_entries;
}
-int wilc_wlan_txq_add_mgmt_pkt(void *priv, u8 *buffer, u32 buffer_size,
wilc_tx_complete_func_t func)
+int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer,
+ u32 buffer_size, wilc_tx_complete_func_t func)
{
wilc_wlan_dev_t *p = &g_wlan;
diff --git a/drivers/staging/wilc1000/wilc_wlan.h
b/drivers/staging/wilc1000/wilc_wlan.h
index 57e1d51..2eb7e20 100644
--- a/drivers/staging/wilc1000/wilc_wlan.h
+++ b/drivers/staging/wilc1000/wilc_wlan.h
@@ -307,6 +307,6 @@ int wilc_wlan_cfg_set(int start, u32 wid, u8 *buffer, u32
buffer_size,
int commit, u32 drvHandler);
int wilc_wlan_cfg_get(int start, u32 wid, int commit, u32 drvHandler);
int wilc_wlan_cfg_get_val(u32 wid, u8 *buffer, u32 buffer_size);
-int wilc_wlan_txq_add_mgmt_pkt(void *priv, u8 *buffer, u32 buffer_size,
- wilc_tx_complete_func_t func);
+int wilc_wlan_txq_add_mgmt_pkt(struct net_device *dev, void *priv, u8 *buffer,
+ u32 buffer_size, wilc_tx_complete_func_t func);
#endif
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH RESEND 03/12] staging: wilc1000: wilc_wlan_txq_remove_from_head: add new argument dev
Add new argument dev and use it instead of g_linux_wlan, and pass argument
dev to the function as well.
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/wilc_wlan.c | 16 +++-
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/wilc_wlan.c
b/drivers/staging/wilc1000/wilc_wlan.c
index 6c7cbd1..5dcc4d2 100644
--- a/drivers/staging/wilc1000/wilc_wlan.c
+++ b/drivers/staging/wilc1000/wilc_wlan.c
@@ -159,13 +159,19 @@ static void wilc_wlan_txq_remove(struct txq_entry_t *tqe)
}
-static struct txq_entry_t *wilc_wlan_txq_remove_from_head(void)
+static struct txq_entry_t *
+wilc_wlan_txq_remove_from_head(struct net_device *dev)
{
struct txq_entry_t *tqe;
wilc_wlan_dev_t *p = &g_wlan;
unsigned long flags;
+ perInterface_wlan_t *nic;
+ struct wilc *wilc;
- spin_lock_irqsave(&g_linux_wlan->txq_spinlock, flags);
+ nic = netdev_priv(dev);
+ wilc = nic->wilc;
+
+ spin_lock_irqsave(&wilc->txq_spinlock, flags);
if (p->txq_head) {
tqe = p->txq_head;
p->txq_head = tqe->next;
@@ -180,7 +186,7 @@ static struct txq_entry_t
*wilc_wlan_txq_remove_from_head(void)
} else {
tqe = NULL;
}
- spin_unlock_irqrestore(&g_linux_wlan->txq_spinlock, flags);
+ spin_unlock_irqrestore(&wilc->txq_spinlock, flags);
return tqe;
}
@@ -1035,7 +1041,7 @@ int wilc_wlan_handle_txq(struct net_device *dev, u32
*pu32TxqCount)
offset = 0;
i = 0;
do {
- tqe = wilc_wlan_txq_remove_from_head();
+ tqe = wilc_wlan_txq_remove_from_head(dev);
if (tqe != NULL && (vmm_table[i] != 0)) {
u32 header, buffer_offset;
@@ -1668,7 +1674,7 @@ void wilc_wlan_cleanup(struct net_device *dev)
p->quit = 1;
do {
- tqe = wilc_wlan_txq_remove_from_head();
+ tqe = wilc_wlan_txq_remove_from_head(dev);
if (tqe == NULL)
break;
if (tqe->tx_complete_func)
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 62/64] staging: wilc1000: rename pstrHostIFSetChan of fuction Handle_SetChannel
From: Leo Kim
This patch renames pstrHostIFSetChan of fuction Handle_SetChannel to hif_set_ch
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 34b3455..819306b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -325,14 +325,14 @@ static struct host_if_drv *get_handler_from_id(int id)
}
static s32 Handle_SetChannel(struct host_if_drv *hif_drv,
-struct channel_attr *pstrHostIFSetChan)
+ struct channel_attr *hif_set_ch)
{
s32 result = 0;
struct wid wid;
wid.id = (u16)WID_CURRENT_CHANNEL;
wid.type = WID_CHAR;
- wid.val = (char *)&pstrHostIFSetChan->set_ch;
+ wid.val = (char *)&hif_set_ch->set_ch;
wid.size = sizeof(char);
PRINT_D(HOSTINF_DBG, "Setting channel\n");
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 55/64] staging: wilc1000: rename u8AmpduParams of struct add_sta_param
From: Leo Kim
This patch renames u8AmpduParams of struct add_sta_param to ht_ampdu_params
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 ++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index e6388ff..8f7d302 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2324,7 +2324,7 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
*pu8CurrByte++ = pstrStationParam->ht_capa_info & 0xFF;
*pu8CurrByte++ = (pstrStationParam->ht_capa_info >> 8) & 0xFF;
- *pu8CurrByte++ = pstrStationParam->u8AmpduParams;
+ *pu8CurrByte++ = pstrStationParam->ht_ampdu_params;
memcpy(pu8CurrByte, pstrStationParam->au8SuppMCsSet,
WILC_SUPP_MCS_SET_SIZE);
pu8CurrByte += WILC_SUPP_MCS_SET_SIZE;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 782088f..bb3bf07 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -294,7 +294,7 @@ struct add_sta_param {
const u8 *rates;
bool ht_supported;
u16 ht_capa_info;
- u8 u8AmpduParams;
+ u8 ht_ampdu_params;
u8 au8SuppMCsSet[16];
u16 u16HTExtParams;
u32 u32TxBeamformingCap;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 0d465c1..5ea7bd2 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3014,7 +3014,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
} else {
strStaParams.ht_supported = true;
strStaParams.ht_capa_info = params->ht_capa->cap_info;
- strStaParams.u8AmpduParams =
params->ht_capa->ampdu_params_info;
+ strStaParams.ht_ampdu_params =
params->ht_capa->ampdu_params_info;
memcpy(strStaParams.au8SuppMCsSet,
¶ms->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
strStaParams.u16HTExtParams =
params->ht_capa->extended_ht_cap_info;
strStaParams.u32TxBeamformingCap =
params->ht_capa->tx_BF_cap_info;
@@ -3028,7 +3028,8 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_supported);
PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
strStaParams.ht_capa_info);
- PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
strStaParams.u8AmpduParams);
+ PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
+ strStaParams.ht_ampdu_params);
PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.u16HTExtParams);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.u32TxBeamformingCap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.u8ASELCap);
@@ -3130,7 +3131,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
} else {
strStaParams.ht_supported = true;
strStaParams.ht_capa_info = params->ht_capa->cap_info;
- strStaParams.u8AmpduParams =
params->ht_capa->ampdu_params_info;
+ strStaParams.ht_ampdu_params =
params->ht_capa->ampdu_params_info;
memcpy(strStaParams.au8SuppMCsSet,
¶ms->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
strStaParams.u16HTExtParams =
params->ht_capa->extended_ht_cap_info;
strStaParams.u32TxBeamformingCap =
params->ht_capa->tx_BF_cap_info;
@@ -3145,7 +3146,8 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_supported);
PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
strStaParams.ht_capa_info);
- PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
strStaParams.u8AmpduParams);
+ PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
+ strStaParams.ht_ampdu_params);
PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.u16HTExtParams);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.u32TxBeamformingCap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.u8ASELCap);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/d
[PATCH V2 57/64] staging: wilc1000: rename u16HTExtParams of struct add_sta_param
From: Leo Kim
This patch renames u16HTExtParams of struct add_sta_param to ht_ext_params
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 ++
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index d0a65c7..be1fcbd 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2329,8 +2329,8 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
WILC_SUPP_MCS_SET_SIZE);
pu8CurrByte += WILC_SUPP_MCS_SET_SIZE;
- *pu8CurrByte++ = pstrStationParam->u16HTExtParams & 0xFF;
- *pu8CurrByte++ = (pstrStationParam->u16HTExtParams >> 8) & 0xFF;
+ *pu8CurrByte++ = pstrStationParam->ht_ext_params & 0xFF;
+ *pu8CurrByte++ = (pstrStationParam->ht_ext_params >> 8) & 0xFF;
*pu8CurrByte++ = pstrStationParam->u32TxBeamformingCap & 0xFF;
*pu8CurrByte++ = (pstrStationParam->u32TxBeamformingCap >> 8) & 0xFF;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 798adcf..c8e2d3f 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -296,7 +296,7 @@ struct add_sta_param {
u16 ht_capa_info;
u8 ht_ampdu_params;
u8 ht_supp_mcs_set[16];
- u16 u16HTExtParams;
+ u16 ht_ext_params;
u32 u32TxBeamformingCap;
u8 u8ASELCap;
u16 u16FlagsMask;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index ef308da..e417785 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3018,7 +3018,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
memcpy(strStaParams.ht_supp_mcs_set,
¶ms->ht_capa->mcs,
WILC_SUPP_MCS_SET_SIZE);
- strStaParams.u16HTExtParams =
params->ht_capa->extended_ht_cap_info;
+ strStaParams.ht_ext_params =
params->ht_capa->extended_ht_cap_info;
strStaParams.u32TxBeamformingCap =
params->ht_capa->tx_BF_cap_info;
strStaParams.u8ASELCap =
params->ht_capa->antenna_selection_info;
}
@@ -3032,7 +3032,8 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_capa_info);
PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
strStaParams.ht_ampdu_params);
- PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.u16HTExtParams);
+ PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
+ strStaParams.ht_ext_params);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.u32TxBeamformingCap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.u8ASELCap);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.u16FlagsMask);
@@ -3137,7 +3138,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
memcpy(strStaParams.ht_supp_mcs_set,
¶ms->ht_capa->mcs,
WILC_SUPP_MCS_SET_SIZE);
- strStaParams.u16HTExtParams =
params->ht_capa->extended_ht_cap_info;
+ strStaParams.ht_ext_params =
params->ht_capa->extended_ht_cap_info;
strStaParams.u32TxBeamformingCap =
params->ht_capa->tx_BF_cap_info;
strStaParams.u8ASELCap =
params->ht_capa->antenna_selection_info;
@@ -3152,7 +3153,8 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_capa_info);
PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
strStaParams.ht_ampdu_params);
- PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.u16HTExtParams);
+ PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
+ strStaParams.ht_ext_params);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.u32TxBeamformingCap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.u8ASELCap);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.u16FlagsMask);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 64/64] staging: wilc1000: rename pstrHostIfSetOperationMode of fuction Handle_SetOperationMode
From: Leo Kim
This patch renames pstrHostIfSetOperationMode of fuction Handle_SetOperationMode
to hif_op_mode to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 96c6d4a..17826f3 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -373,20 +373,20 @@ static s32 Handle_SetWfiDrvHandler(struct host_if_drv
*hif_drv,
}
static s32 Handle_SetOperationMode(struct host_if_drv *hif_drv,
- struct op_mode *pstrHostIfSetOperationMode)
+ struct op_mode *hif_op_mode)
{
s32 result = 0;
struct wid wid;
wid.id = (u16)WID_SET_OPERATION_MODE;
wid.type = WID_INT;
- wid.val = (s8 *)&pstrHostIfSetOperationMode->mode;
+ wid.val = (s8 *)&hif_op_mode->mode;
wid.size = sizeof(u32);
result = send_config_pkt(SET_CFG, &wid, 1,
get_id_from_handler(hif_drv));
- if ((pstrHostIfSetOperationMode->mode) == IDLE_MODE)
+ if ((hif_op_mode->mode) == IDLE_MODE)
up(&hif_sema_driver);
if (result) {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 60/64] staging: wilc1000: rename u16FlagsMask of struct add_sta_param
From: Leo Kim
This patch renames u16FlagsMask of struct add_sta_param to flags_mask
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 ++
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 5a2e874..258dabd 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2339,8 +2339,8 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
*pu8CurrByte++ = pstrStationParam->ht_ante_sel;
- *pu8CurrByte++ = pstrStationParam->u16FlagsMask & 0xFF;
- *pu8CurrByte++ = (pstrStationParam->u16FlagsMask >> 8) & 0xFF;
+ *pu8CurrByte++ = pstrStationParam->flags_mask & 0xFF;
+ *pu8CurrByte++ = (pstrStationParam->flags_mask >> 8) & 0xFF;
*pu8CurrByte++ = pstrStationParam->u16FlagsSet & 0xFF;
*pu8CurrByte++ = (pstrStationParam->u16FlagsSet >> 8) & 0xFF;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 5ad0bfa..1422b90 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -299,7 +299,7 @@ struct add_sta_param {
u16 ht_ext_params;
u32 ht_tx_bf_cap;
u8 ht_ante_sel;
- u16 u16FlagsMask;
+ u16 flags_mask;
u16 u16FlagsSet;
};
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index a2c0878..0ae47c5 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3023,7 +3023,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_ante_sel =
params->ht_capa->antenna_selection_info;
}
- strStaParams.u16FlagsMask = params->sta_flags_mask;
+ strStaParams.flags_mask = params->sta_flags_mask;
strStaParams.u16FlagsSet = params->sta_flags_set;
PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
@@ -3038,7 +3038,8 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_tx_bf_cap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.ht_ante_sel);
- PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.u16FlagsMask);
+ PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
+ strStaParams.flags_mask);
PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
strStaParams.u16FlagsSet);
s32Error = host_int_add_station(priv->hWILCWFIDrv,
&strStaParams);
@@ -3145,7 +3146,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_ante_sel =
params->ht_capa->antenna_selection_info;
}
- strStaParams.u16FlagsMask = params->sta_flags_mask;
+ strStaParams.flags_mask = params->sta_flags_mask;
strStaParams.u16FlagsSet = params->sta_flags_set;
PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
@@ -3160,7 +3161,8 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_tx_bf_cap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.ht_ante_sel);
- PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.u16FlagsMask);
+ PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
+ strStaParams.flags_mask);
PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
strStaParams.u16FlagsSet);
s32Error = host_int_edit_station(priv->hWILCWFIDrv,
&strStaParams);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 58/64] staging: wilc1000: rename u32TxBeamformingCap of struct add_sta_param
From: Leo Kim
This patch renames u32TxBeamformingCap of struct add_sta_param to ht_tx_bf_cap
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 8
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 ++
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index be1fcbd..41ccd80 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2332,10 +2332,10 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
*pu8CurrByte++ = pstrStationParam->ht_ext_params & 0xFF;
*pu8CurrByte++ = (pstrStationParam->ht_ext_params >> 8) & 0xFF;
- *pu8CurrByte++ = pstrStationParam->u32TxBeamformingCap & 0xFF;
- *pu8CurrByte++ = (pstrStationParam->u32TxBeamformingCap >> 8) & 0xFF;
- *pu8CurrByte++ = (pstrStationParam->u32TxBeamformingCap >> 16) & 0xFF;
- *pu8CurrByte++ = (pstrStationParam->u32TxBeamformingCap >> 24) & 0xFF;
+ *pu8CurrByte++ = pstrStationParam->ht_tx_bf_cap & 0xFF;
+ *pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 8) & 0xFF;
+ *pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 16) & 0xFF;
+ *pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 24) & 0xFF;
*pu8CurrByte++ = pstrStationParam->u8ASELCap;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index c8e2d3f..3311d2f 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -297,7 +297,7 @@ struct add_sta_param {
u8 ht_ampdu_params;
u8 ht_supp_mcs_set[16];
u16 ht_ext_params;
- u32 u32TxBeamformingCap;
+ u32 ht_tx_bf_cap;
u8 u8ASELCap;
u16 u16FlagsMask;
u16 u16FlagsSet;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index e417785..abd90963 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3019,7 +3019,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
¶ms->ht_capa->mcs,
WILC_SUPP_MCS_SET_SIZE);
strStaParams.ht_ext_params =
params->ht_capa->extended_ht_cap_info;
- strStaParams.u32TxBeamformingCap =
params->ht_capa->tx_BF_cap_info;
+ strStaParams.ht_tx_bf_cap =
params->ht_capa->tx_BF_cap_info;
strStaParams.u8ASELCap =
params->ht_capa->antenna_selection_info;
}
@@ -3034,7 +3034,8 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_ampdu_params);
PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.ht_ext_params);
- PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.u32TxBeamformingCap);
+ PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
+ strStaParams.ht_tx_bf_cap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.u8ASELCap);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.u16FlagsMask);
PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
strStaParams.u16FlagsSet);
@@ -3139,7 +3140,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
¶ms->ht_capa->mcs,
WILC_SUPP_MCS_SET_SIZE);
strStaParams.ht_ext_params =
params->ht_capa->extended_ht_cap_info;
- strStaParams.u32TxBeamformingCap =
params->ht_capa->tx_BF_cap_info;
+ strStaParams.ht_tx_bf_cap =
params->ht_capa->tx_BF_cap_info;
strStaParams.u8ASELCap =
params->ht_capa->antenna_selection_info;
}
@@ -3155,7 +3156,8 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_ampdu_params);
PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.ht_ext_params);
- PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.u32TxBeamformingCap);
+ PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
+ strStaParams.ht_tx_bf_cap);
PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.u8ASELCap);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.u16FlagsMask);
PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
strStaParams.u16FlagsSet);
--
1.9.1
___
devel maili
[PATCH V2 63/64] staging: wilc1000: rename pstrHostIfSetDrvHandler of fuction Handle_SetWfiDrvHandler
From: Leo Kim
This patch renames pstrHostIfSetDrvHandler of fuction Handle_SetWfiDrvHandler
to hif_drv_handler to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 819306b..96c6d4a 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -349,18 +349,17 @@ static s32 Handle_SetChannel(struct host_if_drv *hif_drv,
}
static s32 Handle_SetWfiDrvHandler(struct host_if_drv *hif_drv,
- struct drv_handler *pstrHostIfSetDrvHandler)
+ struct drv_handler *hif_drv_handler)
{
s32 result = 0;
struct wid wid;
wid.id = (u16)WID_SET_DRV_HANDLER;
wid.type = WID_INT;
- wid.val = (s8 *)&pstrHostIfSetDrvHandler->handler;
+ wid.val = (s8 *)&hif_drv_handler->handler;
wid.size = sizeof(u32);
- result = send_config_pkt(SET_CFG, &wid, 1,
-pstrHostIfSetDrvHandler->handler);
+ result = send_config_pkt(SET_CFG, &wid, 1, hif_drv_handler->handler);
if (!hif_drv)
up(&hif_sema_driver);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 61/64] staging: wilc1000: rename u16FlagsSet of struct add_sta_param
From: Leo Kim
This patch renames u16FlagsSet of struct add_sta_param to flags_set
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 ++
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 258dabd..34b3455 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2342,8 +2342,8 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
*pu8CurrByte++ = pstrStationParam->flags_mask & 0xFF;
*pu8CurrByte++ = (pstrStationParam->flags_mask >> 8) & 0xFF;
- *pu8CurrByte++ = pstrStationParam->u16FlagsSet & 0xFF;
- *pu8CurrByte++ = (pstrStationParam->u16FlagsSet >> 8) & 0xFF;
+ *pu8CurrByte++ = pstrStationParam->flags_set & 0xFF;
+ *pu8CurrByte++ = (pstrStationParam->flags_set >> 8) & 0xFF;
return pu8CurrByte - pu8Buffer;
}
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 1422b90..72c4797 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -300,7 +300,7 @@ struct add_sta_param {
u32 ht_tx_bf_cap;
u8 ht_ante_sel;
u16 flags_mask;
- u16 u16FlagsSet;
+ u16 flags_set;
};
s32 host_int_remove_key(struct host_if_drv *hWFIDrv, const u8 *pu8StaAddress);
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 0ae47c5..4de27ef 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3024,7 +3024,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
}
strStaParams.flags_mask = params->sta_flags_mask;
- strStaParams.u16FlagsSet = params->sta_flags_set;
+ strStaParams.flags_set = params->sta_flags_set;
PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
strStaParams.ht_supported);
@@ -3040,7 +3040,8 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_ante_sel);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.flags_mask);
- PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
strStaParams.u16FlagsSet);
+ PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
+ strStaParams.flags_set);
s32Error = host_int_add_station(priv->hWILCWFIDrv,
&strStaParams);
if (s32Error)
@@ -3147,7 +3148,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
}
strStaParams.flags_mask = params->sta_flags_mask;
- strStaParams.u16FlagsSet = params->sta_flags_set;
+ strStaParams.flags_set = params->sta_flags_set;
PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
strStaParams.ht_supported);
@@ -3163,7 +3164,8 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_ante_sel);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.flags_mask);
- PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
strStaParams.u16FlagsSet);
+ PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
+ strStaParams.flags_set);
s32Error = host_int_edit_station(priv->hWILCWFIDrv,
&strStaParams);
if (s32Error)
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 56/64] staging: wilc1000: rename au8SuppMCsSet of struct add_sta_param
From: Leo Kim
This patch renames au8SuppMCsSet of struct add_sta_param to ht_supp_mcs_set
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 3 ++-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8 ++--
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 8f7d302..d0a65c7 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2325,7 +2325,8 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
*pu8CurrByte++ = (pstrStationParam->ht_capa_info >> 8) & 0xFF;
*pu8CurrByte++ = pstrStationParam->ht_ampdu_params;
- memcpy(pu8CurrByte, pstrStationParam->au8SuppMCsSet,
WILC_SUPP_MCS_SET_SIZE);
+ memcpy(pu8CurrByte, pstrStationParam->ht_supp_mcs_set,
+ WILC_SUPP_MCS_SET_SIZE);
pu8CurrByte += WILC_SUPP_MCS_SET_SIZE;
*pu8CurrByte++ = pstrStationParam->u16HTExtParams & 0xFF;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index bb3bf07..798adcf 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -295,7 +295,7 @@ struct add_sta_param {
bool ht_supported;
u16 ht_capa_info;
u8 ht_ampdu_params;
- u8 au8SuppMCsSet[16];
+ u8 ht_supp_mcs_set[16];
u16 u16HTExtParams;
u32 u32TxBeamformingCap;
u8 u8ASELCap;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 5ea7bd2..ef308da 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3015,7 +3015,9 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_supported = true;
strStaParams.ht_capa_info = params->ht_capa->cap_info;
strStaParams.ht_ampdu_params =
params->ht_capa->ampdu_params_info;
- memcpy(strStaParams.au8SuppMCsSet,
¶ms->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
+ memcpy(strStaParams.ht_supp_mcs_set,
+ ¶ms->ht_capa->mcs,
+ WILC_SUPP_MCS_SET_SIZE);
strStaParams.u16HTExtParams =
params->ht_capa->extended_ht_cap_info;
strStaParams.u32TxBeamformingCap =
params->ht_capa->tx_BF_cap_info;
strStaParams.u8ASELCap =
params->ht_capa->antenna_selection_info;
@@ -3132,7 +3134,9 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_supported = true;
strStaParams.ht_capa_info = params->ht_capa->cap_info;
strStaParams.ht_ampdu_params =
params->ht_capa->ampdu_params_info;
- memcpy(strStaParams.au8SuppMCsSet,
¶ms->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
+ memcpy(strStaParams.ht_supp_mcs_set,
+ ¶ms->ht_capa->mcs,
+ WILC_SUPP_MCS_SET_SIZE);
strStaParams.u16HTExtParams =
params->ht_capa->extended_ht_cap_info;
strStaParams.u32TxBeamformingCap =
params->ht_capa->tx_BF_cap_info;
strStaParams.u8ASELCap =
params->ht_capa->antenna_selection_info;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 59/64] staging: wilc1000: rename u8ASELCap of struct add_sta_param
From: Leo Kim
This patch renames u8ASELCap of struct add_sta_param to ht_ante_sel
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 11 ++-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 41ccd80..5a2e874 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2337,7 +2337,7 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
*pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 16) & 0xFF;
*pu8CurrByte++ = (pstrStationParam->ht_tx_bf_cap >> 24) & 0xFF;
- *pu8CurrByte++ = pstrStationParam->u8ASELCap;
+ *pu8CurrByte++ = pstrStationParam->ht_ante_sel;
*pu8CurrByte++ = pstrStationParam->u16FlagsMask & 0xFF;
*pu8CurrByte++ = (pstrStationParam->u16FlagsMask >> 8) & 0xFF;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 3311d2f..5ad0bfa 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -298,7 +298,7 @@ struct add_sta_param {
u8 ht_supp_mcs_set[16];
u16 ht_ext_params;
u32 ht_tx_bf_cap;
- u8 u8ASELCap;
+ u8 ht_ante_sel;
u16 u16FlagsMask;
u16 u16FlagsSet;
};
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index abd90963..a2c0878 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3020,7 +3020,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
WILC_SUPP_MCS_SET_SIZE);
strStaParams.ht_ext_params =
params->ht_capa->extended_ht_cap_info;
strStaParams.ht_tx_bf_cap =
params->ht_capa->tx_BF_cap_info;
- strStaParams.u8ASELCap =
params->ht_capa->antenna_selection_info;
+ strStaParams.ht_ante_sel =
params->ht_capa->antenna_selection_info;
}
strStaParams.u16FlagsMask = params->sta_flags_mask;
@@ -3036,7 +3036,8 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_ext_params);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.ht_tx_bf_cap);
- PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.u8ASELCap);
+ PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
+ strStaParams.ht_ante_sel);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.u16FlagsMask);
PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
strStaParams.u16FlagsSet);
@@ -3141,8 +3142,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
WILC_SUPP_MCS_SET_SIZE);
strStaParams.ht_ext_params =
params->ht_capa->extended_ht_cap_info;
strStaParams.ht_tx_bf_cap =
params->ht_capa->tx_BF_cap_info;
- strStaParams.u8ASELCap =
params->ht_capa->antenna_selection_info;
-
+ strStaParams.ht_ante_sel =
params->ht_capa->antenna_selection_info;
}
strStaParams.u16FlagsMask = params->sta_flags_mask;
@@ -3158,7 +3158,8 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_ext_params);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.ht_tx_bf_cap);
- PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
strStaParams.u8ASELCap);
+ PRINT_D(HOSTAPD_DBG, "Antenna selection info = %d\n",
+ strStaParams.ht_ante_sel);
PRINT_D(HOSTAPD_DBG, "Flag Mask = %d\n",
strStaParams.u16FlagsMask);
PRINT_D(HOSTAPD_DBG, "Flag Set = %d\n",
strStaParams.u16FlagsSet);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 52/64] staging: wilc1000: rename pu8Rates of struct add_sta_param
From: Leo Kim
This patch renames pu8Rates of struct add_sta_param to rates
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 14 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 9b76acd..910462a 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2316,7 +2316,7 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
*pu8CurrByte++ = pstrStationParam->rates_len;
if (pstrStationParam->rates_len > 0)
- memcpy(pu8CurrByte, pstrStationParam->pu8Rates,
+ memcpy(pu8CurrByte, pstrStationParam->rates,
pstrStationParam->rates_len);
pu8CurrByte += pstrStationParam->rates_len;
@@ -2372,7 +2372,7 @@ static void Handle_AddStation(struct host_if_drv *hif_drv,
PRINT_ER("Failed to send add station config packet\n");
ERRORHANDLER:
- kfree(pstrStationParam->pu8Rates);
+ kfree(pstrStationParam->rates);
kfree(wid.val);
}
@@ -2474,7 +2474,7 @@ static void Handle_EditStation(struct host_if_drv
*hif_drv,
PRINT_ER("Failed to send edit station config packet\n");
ERRORHANDLER:
- kfree(pstrStationParam->pu8Rates);
+ kfree(pstrStationParam->rates);
kfree(wid.val);
}
@@ -4552,9 +4552,9 @@ s32 host_int_add_station(struct host_if_drv *hif_drv,
if (!rates)
return -ENOMEM;
- memcpy(rates, pstrStaParams->pu8Rates,
+ memcpy(rates, pstrStaParams->rates,
pstrAddStationMsg->rates_len);
- pstrAddStationMsg->pu8Rates = rates;
+ pstrAddStationMsg->rates = rates;
}
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
@@ -4669,9 +4669,9 @@ s32 host_int_edit_station(struct host_if_drv *hif_drv,
if (!rates)
return -ENOMEM;
- memcpy(rates, pstrStaParams->pu8Rates,
+ memcpy(rates, pstrStaParams->rates,
pstrAddStationMsg->rates_len);
- pstrAddStationMsg->pu8Rates = rates;
+ pstrAddStationMsg->rates = rates;
}
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index b13c76e..5fba44f 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -291,7 +291,7 @@ struct add_sta_param {
u8 bssid[ETH_ALEN];
u16 aid;
u8 rates_len;
- const u8 *pu8Rates;
+ const u8 *rates;
bool bIsHTSupported;
u16 u16HTCapInfo;
u8 u8AmpduParams;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 715499a..019364a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2999,7 +2999,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
memcpy(priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid],
mac, ETH_ALEN);
strStaParams.aid = params->aid;
strStaParams.rates_len = params->supported_rates_len;
- strStaParams.pu8Rates = params->supported_rates;
+ strStaParams.rates = params->supported_rates;
PRINT_D(CFG80211_DBG, "Adding station parameters %d\n",
params->aid);
@@ -3113,7 +3113,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
memcpy(strStaParams.bssid, mac, ETH_ALEN);
strStaParams.aid = params->aid;
strStaParams.rates_len = params->supported_rates_len;
- strStaParams.pu8Rates = params->supported_rates;
+ strStaParams.rates = params->supported_rates;
PRINT_D(HOSTAPD_DBG, "BSSID = %x%x%x%x%x%x\n",
strStaParams.bssid[0], strStaParams.bssid[1],
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 50/64] staging: wilc1000: rename u16AssocID of struct add_sta_param
From: Leo Kim
This patch renames u16AssocID of struct add_sta_param to aid
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 8
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 2cf3ed5..512000e 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2311,8 +2311,8 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
memcpy(pu8CurrByte, pstrStationParam->bssid, ETH_ALEN);
pu8CurrByte += ETH_ALEN;
- *pu8CurrByte++ = pstrStationParam->u16AssocID & 0xFF;
- *pu8CurrByte++ = (pstrStationParam->u16AssocID >> 8) & 0xFF;
+ *pu8CurrByte++ = pstrStationParam->aid & 0xFF;
+ *pu8CurrByte++ = (pstrStationParam->aid >> 8) & 0xFF;
*pu8CurrByte++ = pstrStationParam->u8NumRates;
if (pstrStationParam->u8NumRates > 0)
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 58e4f92..7d8a166 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -289,7 +289,7 @@ struct host_if_drv {
struct add_sta_param {
u8 bssid[ETH_ALEN];
- u16 u16AssocID;
+ u16 aid;
u8 u8NumRates;
const u8 *pu8Rates;
bool bIsHTSupported;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 2ec85f0..00fa411 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2997,7 +2997,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
if (nic->iftype == AP_MODE || nic->iftype == GO_MODE) {
memcpy(strStaParams.bssid, mac, ETH_ALEN);
memcpy(priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid],
mac, ETH_ALEN);
- strStaParams.u16AssocID = params->aid;
+ strStaParams.aid = params->aid;
strStaParams.u8NumRates = params->supported_rates_len;
strStaParams.pu8Rates = params->supported_rates;
@@ -3005,7 +3005,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
PRINT_D(CFG80211_DBG, "BSSID = %x%x%x%x%x%x\n",
priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][0],
priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][1],
priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][2],
priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][3],
priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][4],
priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid][5]);
- PRINT_D(HOSTAPD_DBG, "ASSOC ID = %d\n",
strStaParams.u16AssocID);
+ PRINT_D(HOSTAPD_DBG, "ASSOC ID = %d\n", strStaParams.aid);
PRINT_D(HOSTAPD_DBG, "Number of supported rates = %d\n",
strStaParams.u8NumRates);
if (params->ht_capa == NULL) {
@@ -3110,7 +3110,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
if (nic->iftype == AP_MODE || nic->iftype == GO_MODE) {
memcpy(strStaParams.bssid, mac, ETH_ALEN);
- strStaParams.u16AssocID = params->aid;
+ strStaParams.aid = params->aid;
strStaParams.u8NumRates = params->supported_rates_len;
strStaParams.pu8Rates = params->supported_rates;
@@ -3118,7 +3118,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.bssid[0], strStaParams.bssid[1],
strStaParams.bssid[2], strStaParams.bssid[3],
strStaParams.bssid[4], strStaParams.bssid[5]);
- PRINT_D(HOSTAPD_DBG, "ASSOC ID = %d\n",
strStaParams.u16AssocID);
+ PRINT_D(HOSTAPD_DBG, "ASSOC ID = %d\n", strStaParams.aid);
PRINT_D(HOSTAPD_DBG, "Number of supported rates = %d\n",
strStaParams.u8NumRates);
if (params->ht_capa == NULL) {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 53/64] staging: wilc1000: rename bIsHTSupported of struct add_sta_param
From: Leo Kim
This patch renames bIsHTSupported of struct add_sta_param to ht_supported
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 14 --
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 910462a..fbfaf12 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2320,7 +2320,7 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
pstrStationParam->rates_len);
pu8CurrByte += pstrStationParam->rates_len;
- *pu8CurrByte++ = pstrStationParam->bIsHTSupported;
+ *pu8CurrByte++ = pstrStationParam->ht_supported;
*pu8CurrByte++ = pstrStationParam->u16HTCapInfo & 0xFF;
*pu8CurrByte++ = (pstrStationParam->u16HTCapInfo >> 8) & 0xFF;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 5fba44f..2d9d808 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -292,7 +292,7 @@ struct add_sta_param {
u16 aid;
u8 rates_len;
const u8 *rates;
- bool bIsHTSupported;
+ bool ht_supported;
u16 u16HTCapInfo;
u8 u8AmpduParams;
u8 au8SuppMCsSet[16];
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 019364a..d5b5158 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3010,9 +3010,9 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.rates_len);
if (params->ht_capa == NULL) {
- strStaParams.bIsHTSupported = false;
+ strStaParams.ht_supported = false;
} else {
- strStaParams.bIsHTSupported = true;
+ strStaParams.ht_supported = true;
strStaParams.u16HTCapInfo = params->ht_capa->cap_info;
strStaParams.u8AmpduParams =
params->ht_capa->ampdu_params_info;
memcpy(strStaParams.au8SuppMCsSet,
¶ms->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
@@ -3024,7 +3024,8 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.u16FlagsMask = params->sta_flags_mask;
strStaParams.u16FlagsSet = params->sta_flags_set;
- PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
strStaParams.bIsHTSupported);
+ PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
+ strStaParams.ht_supported);
PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
strStaParams.u16HTCapInfo);
PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
strStaParams.u8AmpduParams);
PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.u16HTExtParams);
@@ -3124,9 +3125,9 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.rates_len);
if (params->ht_capa == NULL) {
- strStaParams.bIsHTSupported = false;
+ strStaParams.ht_supported = false;
} else {
- strStaParams.bIsHTSupported = true;
+ strStaParams.ht_supported = true;
strStaParams.u16HTCapInfo = params->ht_capa->cap_info;
strStaParams.u8AmpduParams =
params->ht_capa->ampdu_params_info;
memcpy(strStaParams.au8SuppMCsSet,
¶ms->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
@@ -3139,7 +3140,8 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.u16FlagsMask = params->sta_flags_mask;
strStaParams.u16FlagsSet = params->sta_flags_set;
- PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
strStaParams.bIsHTSupported);
+ PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
+ strStaParams.ht_supported);
PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
strStaParams.u16HTCapInfo);
PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
strStaParams.u8AmpduParams);
PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.u16HTExtParams);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 54/64] staging: wilc1000: rename u16HTCapInfo of struct add_sta_param
From: Leo Kim
This patch renames u16HTCapInfo of struct add_sta_param to ht_capa_info
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 ++
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index fbfaf12..e6388ff 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2321,8 +2321,8 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
pu8CurrByte += pstrStationParam->rates_len;
*pu8CurrByte++ = pstrStationParam->ht_supported;
- *pu8CurrByte++ = pstrStationParam->u16HTCapInfo & 0xFF;
- *pu8CurrByte++ = (pstrStationParam->u16HTCapInfo >> 8) & 0xFF;
+ *pu8CurrByte++ = pstrStationParam->ht_capa_info & 0xFF;
+ *pu8CurrByte++ = (pstrStationParam->ht_capa_info >> 8) & 0xFF;
*pu8CurrByte++ = pstrStationParam->u8AmpduParams;
memcpy(pu8CurrByte, pstrStationParam->au8SuppMCsSet,
WILC_SUPP_MCS_SET_SIZE);
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 2d9d808..782088f 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -293,7 +293,7 @@ struct add_sta_param {
u8 rates_len;
const u8 *rates;
bool ht_supported;
- u16 u16HTCapInfo;
+ u16 ht_capa_info;
u8 u8AmpduParams;
u8 au8SuppMCsSet[16];
u16 u16HTExtParams;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index d5b5158..0d465c1 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -3013,7 +3013,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_supported = false;
} else {
strStaParams.ht_supported = true;
- strStaParams.u16HTCapInfo = params->ht_capa->cap_info;
+ strStaParams.ht_capa_info = params->ht_capa->cap_info;
strStaParams.u8AmpduParams =
params->ht_capa->ampdu_params_info;
memcpy(strStaParams.au8SuppMCsSet,
¶ms->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
strStaParams.u16HTExtParams =
params->ht_capa->extended_ht_cap_info;
@@ -3026,7 +3026,8 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
strStaParams.ht_supported);
- PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
strStaParams.u16HTCapInfo);
+ PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
+ strStaParams.ht_capa_info);
PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
strStaParams.u8AmpduParams);
PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.u16HTExtParams);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.u32TxBeamformingCap);
@@ -3128,7 +3129,7 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
strStaParams.ht_supported = false;
} else {
strStaParams.ht_supported = true;
- strStaParams.u16HTCapInfo = params->ht_capa->cap_info;
+ strStaParams.ht_capa_info = params->ht_capa->cap_info;
strStaParams.u8AmpduParams =
params->ht_capa->ampdu_params_info;
memcpy(strStaParams.au8SuppMCsSet,
¶ms->ht_capa->mcs, WILC_SUPP_MCS_SET_SIZE);
strStaParams.u16HTExtParams =
params->ht_capa->extended_ht_cap_info;
@@ -3142,7 +3143,8 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
PRINT_D(HOSTAPD_DBG, "IS HT supported = %d\n",
strStaParams.ht_supported);
- PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
strStaParams.u16HTCapInfo);
+ PRINT_D(HOSTAPD_DBG, "Capability Info = %d\n",
+ strStaParams.ht_capa_info);
PRINT_D(HOSTAPD_DBG, "AMPDU Params = %d\n",
strStaParams.u8AmpduParams);
PRINT_D(HOSTAPD_DBG, "HT Extended params = %d\n",
strStaParams.u16HTExtParams);
PRINT_D(HOSTAPD_DBG, "Tx Beamforming Cap = %d\n",
strStaParams.u32TxBeamformingCap);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 45/64] staging: wilc1000: rename tenuAuth_type of struct user_conn_req
From: Leo Kim
This patch renames tenuAuth_type of struct user_conn_req to auth_type
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 9 +
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index f465233..6c49091 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1028,7 +1028,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
}
hif_drv->usr_conn_req.u8security = pstrHostIFconnectAttr->security;
- hif_drv->usr_conn_req.tenuAuth_type = pstrHostIFconnectAttr->auth_type;
+ hif_drv->usr_conn_req.auth_type = pstrHostIFconnectAttr->auth_type;
hif_drv->usr_conn_req.conn_result = pstrHostIFconnectAttr->result;
hif_drv->usr_conn_req.arg = pstrHostIFconnectAttr->arg;
@@ -1078,13 +1078,14 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
strWIDList[u32WidsCount].id = (u16)WID_AUTH_TYPE;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].val = (s8
*)(&hif_drv->usr_conn_req.tenuAuth_type);
+ strWIDList[u32WidsCount].val = (s8 *)&hif_drv->usr_conn_req.auth_type;
u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7))
- auth_type = (u8)hif_drv->usr_conn_req.tenuAuth_type;
+ auth_type = (u8)hif_drv->usr_conn_req.auth_type;
- PRINT_INFO(HOSTINF_DBG, "Authentication Type = %x\n",
hif_drv->usr_conn_req.tenuAuth_type);
+ PRINT_INFO(HOSTINF_DBG, "Authentication Type = %x\n",
+ hif_drv->usr_conn_req.auth_type);
PRINT_D(HOSTINF_DBG, "Connecting to network of SSID %s on channel %d\n",
hif_drv->usr_conn_req.pu8ssid, pstrHostIFconnectAttr->ch);
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index f824866..c338028 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -206,7 +206,7 @@ struct user_conn_req {
u8 *pu8bssid;
u8 *pu8ssid;
u8 u8security;
- enum AUTHTYPE tenuAuth_type;
+ enum AUTHTYPE auth_type;
size_t ssid_len;
u8 *ies;
size_t ies_len;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 51/64] staging: wilc1000: rename u8NumRates of struct add_sta_param
From: Leo Kim
This patch renames u8NumRates of struct add_sta_param to rates_len
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 27 +--
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +
3 files changed, 22 insertions(+), 17 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 512000e..9b76acd 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2314,10 +2314,11 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
*pu8CurrByte++ = pstrStationParam->aid & 0xFF;
*pu8CurrByte++ = (pstrStationParam->aid >> 8) & 0xFF;
- *pu8CurrByte++ = pstrStationParam->u8NumRates;
- if (pstrStationParam->u8NumRates > 0)
- memcpy(pu8CurrByte, pstrStationParam->pu8Rates,
pstrStationParam->u8NumRates);
- pu8CurrByte += pstrStationParam->u8NumRates;
+ *pu8CurrByte++ = pstrStationParam->rates_len;
+ if (pstrStationParam->rates_len > 0)
+ memcpy(pu8CurrByte, pstrStationParam->pu8Rates,
+ pstrStationParam->rates_len);
+ pu8CurrByte += pstrStationParam->rates_len;
*pu8CurrByte++ = pstrStationParam->bIsHTSupported;
*pu8CurrByte++ = pstrStationParam->u16HTCapInfo & 0xFF;
@@ -2356,7 +2357,7 @@ static void Handle_AddStation(struct host_if_drv *hif_drv,
PRINT_D(HOSTINF_DBG, "Handling add station\n");
wid.id = (u16)WID_ADD_STA;
wid.type = WID_BIN;
- wid.size = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
+ wid.size = WILC_ADD_STA_LENGTH + pstrStationParam->rates_len;
wid.val = kmalloc(wid.size, GFP_KERNEL);
if (!wid.val)
@@ -2457,7 +2458,7 @@ static void Handle_EditStation(struct host_if_drv
*hif_drv,
wid.id = (u16)WID_EDIT_STA;
wid.type = WID_BIN;
- wid.size = WILC_ADD_STA_LENGTH + pstrStationParam->u8NumRates;
+ wid.size = WILC_ADD_STA_LENGTH + pstrStationParam->rates_len;
PRINT_D(HOSTINF_DBG, "Handling edit station\n");
wid.val = kmalloc(wid.size, GFP_KERNEL);
@@ -4545,13 +4546,14 @@ s32 host_int_add_station(struct host_if_drv *hif_drv,
msg.drv = hif_drv;
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(struct add_sta_param));
- if (pstrAddStationMsg->u8NumRates > 0) {
- u8 *rates = kmalloc(pstrAddStationMsg->u8NumRates, GFP_KERNEL);
+ if (pstrAddStationMsg->rates_len > 0) {
+ u8 *rates = kmalloc(pstrAddStationMsg->rates_len, GFP_KERNEL);
if (!rates)
return -ENOMEM;
- memcpy(rates, pstrStaParams->pu8Rates,
pstrAddStationMsg->u8NumRates);
+ memcpy(rates, pstrStaParams->pu8Rates,
+ pstrAddStationMsg->rates_len);
pstrAddStationMsg->pu8Rates = rates;
}
@@ -4661,13 +4663,14 @@ s32 host_int_edit_station(struct host_if_drv *hif_drv,
msg.drv = hif_drv;
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(struct add_sta_param));
- if (pstrAddStationMsg->u8NumRates > 0) {
- u8 *rates = kmalloc(pstrAddStationMsg->u8NumRates, GFP_KERNEL);
+ if (pstrAddStationMsg->rates_len > 0) {
+ u8 *rates = kmalloc(pstrAddStationMsg->rates_len, GFP_KERNEL);
if (!rates)
return -ENOMEM;
- memcpy(rates, pstrStaParams->pu8Rates,
pstrAddStationMsg->u8NumRates);
+ memcpy(rates, pstrStaParams->pu8Rates,
+ pstrAddStationMsg->rates_len);
pstrAddStationMsg->pu8Rates = rates;
}
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 7d8a166..b13c76e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -290,7 +290,7 @@ struct host_if_drv {
struct add_sta_param {
u8 bssid[ETH_ALEN];
u16 aid;
- u8 u8NumRates;
+ u8 rates_len;
const u8 *pu8Rates;
bool bIsHTSupported;
u16 u16HTCapInfo;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 00fa411..715499a 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2998,7 +2998,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
memcpy(strStaParams.bssid, mac, ETH_ALEN);
memcpy(priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid],
mac, ETH_ALEN);
strStaParams.aid = params->aid;
- strStaParams.u8NumRates = params->supported_rates_len;
+ strStaParams.rates_len = params->s
[PATCH V2 47/64] staging: wilc1000: rename u64P2p_MgmtTimeout of struct host_if_drv
From: Leo Kim
This patch renames u64P2p_MgmtTimeout of struct host_if_drv to p2p_timeout
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 12 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 294f90c..00f2717 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -4158,7 +4158,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
hif_drv->cfg_values.passive_scan_time = PASSIVE_SCAN_TIME;
hif_drv->cfg_values.curr_tx_rate = AUTORATE;
- hif_drv->u64P2p_MgmtTimeout = 0;
+ hif_drv->p2p_timeout = 0;
PRINT_INFO(HOSTINF_DBG, "Initialization values, Site survey value: %d\n
Scan source: %d\n Active scan time: %d\n Passive scan time: %d\nCurrent tx Rate
= %d\n",
hif_drv->cfg_values.site_survey_enabled,
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 8450e22..c9a4ce8 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -264,7 +264,7 @@ struct host_if_drv {
struct user_conn_req usr_conn_req;
struct remain_ch remain_on_ch;
u8 remain_on_ch_pending;
- u64 u64P2p_MgmtTimeout;
+ u64 p2p_timeout;
u8 u8P2PConnect;
enum host_if_state hif_state;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3060b8d..116c37d 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1050,7 +1050,7 @@ static int disconnect(struct wiphy *wiphy, struct
net_device *dev, u16 reason_co
u8P2Plocalrandom = 0x01;
u8P2Precvrandom = 0x00;
bWilc_ie = false;
- pstrWFIDrv->u64P2p_MgmtTimeout = 0;
+ pstrWFIDrv->p2p_timeout = 0;
s32Error = host_int_disconnect(priv->hWILCWFIDrv, reason_code);
if (s32Error != 0) {
@@ -1958,7 +1958,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, u8 *buff,
u32 size)
if (ieee80211_is_action(buff[FRAME_TYPE_ID])) {
PRINT_D(GENERIC_DBG, "Rx Action Frame Type: %x %x\n",
buff[ACTION_SUBTYPE_ID], buff[P2P_PUB_ACTION_SUBTYPE]);
- if (priv->bCfgScanning && time_after_eq(jiffies,
(unsigned long)pstrWFIDrv->u64P2p_MgmtTimeout)) {
+ if (priv->bCfgScanning && time_after_eq(jiffies,
(unsigned long)pstrWFIDrv->p2p_timeout)) {
PRINT_D(GENERIC_DBG, "Receiving action frames
from wrong channels\n");
return;
}
@@ -2331,10 +2331,10 @@ static int mgmt_tx(struct wiphy *wiphy,
}
PRINT_D(GENERIC_DBG, "TX: ACTION FRAME Type:%x :
Chan:%d\n", buf[ACTION_SUBTYPE_ID], chan->hw_value);
- pstrWFIDrv->u64P2p_MgmtTimeout = (jiffies +
msecs_to_jiffies(wait));
-
- PRINT_D(GENERIC_DBG, "Current Jiffies: %lu
Timeout:%llu\n", jiffies, pstrWFIDrv->u64P2p_MgmtTimeout);
+ pstrWFIDrv->p2p_timeout = (jiffies +
msecs_to_jiffies(wait));
+ PRINT_D(GENERIC_DBG, "Current Jiffies: %lu
Timeout:%llu\n",
+ jiffies, pstrWFIDrv->p2p_timeout);
}
wilc_wlan_txq_add_mgmt_pkt(mgmt_tx, mgmt_tx->buff,
@@ -2358,7 +2358,7 @@ static int mgmt_tx_cancel_wait(struct wiphy *wiphy,
PRINT_D(GENERIC_DBG, "Tx Cancel wait :%lu\n", jiffies);
- pstrWFIDrv->u64P2p_MgmtTimeout = jiffies;
+ pstrWFIDrv->p2p_timeout = jiffies;
if (!priv->bInP2PlistenState) {
cfg80211_remain_on_channel_expired(priv->wdev,
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 48/64] staging: wilc1000: rename u8P2PConnect of struct host_if_drv
From: Leo Kim
This patch renames u8P2PConnect of struct host_if_drv to p2p_connect
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 16
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index c9a4ce8..60dcc36 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -265,7 +265,7 @@ struct host_if_drv {
struct remain_ch remain_on_ch;
u8 remain_on_ch_pending;
u64 p2p_timeout;
- u8 u8P2PConnect;
+ u8 p2p_connect;
enum host_if_state hif_state;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 116c37d..4828deb 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -564,7 +564,7 @@ static void CfgConnectResult(enum conn_event
enuConnDisconnEvent,
eth_zero_addr(u8ConnectedSSID);
/*Invalidate u8WLANChannel value on wlan0 disconnect*/
- if (!pstrWFIDrv->u8P2PConnect)
+ if (!pstrWFIDrv->p2p_connect)
u8WLANChannel = INVALID_CHANNEL;
PRINT_ER("Unspecified failure: Connection status %d :
MAC status = %d\n", u16ConnectStatus, u8MacStatus);
@@ -623,7 +623,7 @@ static void CfgConnectResult(enum conn_event
enuConnDisconnEvent,
eth_zero_addr(u8ConnectedSSID);
/*Invalidate u8WLANChannel value on wlan0 disconnect*/
- if (!pstrWFIDrv->u8P2PConnect)
+ if (!pstrWFIDrv->p2p_connect)
u8WLANChannel = INVALID_CHANNEL;
/*Incase "P2P CLIENT Connected" send deauthentication reason by
3 to force the WPA_SUPPLICANT to directly change
* virtual interface to station*/
@@ -804,9 +804,10 @@ static int connect(struct wiphy *wiphy, struct net_device
*dev,
PRINT_D(CFG80211_DBG, "Connecting to SSID [%s] on netdev [%p] host if
[%p]\n", sme->ssid, dev, priv->hWILCWFIDrv);
if (!(strncmp(sme->ssid, "DIRECT-", 7))) {
PRINT_D(CFG80211_DBG, "Connected to Direct network,OBSS
disabled\n");
- pstrWFIDrv->u8P2PConnect = 1;
- } else
- pstrWFIDrv->u8P2PConnect = 0;
+ pstrWFIDrv->p2p_connect = 1;
+ } else {
+ pstrWFIDrv->p2p_connect = 0;
+ }
PRINT_INFO(CFG80211_DBG, "Required SSID = %s\n , AuthType = %d\n",
sme->ssid, sme->auth_type);
for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {
@@ -997,9 +998,8 @@ static int connect(struct wiphy *wiphy, struct net_device
*dev,
curr_channel = pstrNetworkInfo->u8channel;
- if (!pstrWFIDrv->u8P2PConnect) {
+ if (!pstrWFIDrv->p2p_connect)
u8WLANChannel = pstrNetworkInfo->u8channel;
- }
linux_wlan_set_bssid(dev, pstrNetworkInfo->au8bssid);
@@ -1041,7 +1041,7 @@ static int disconnect(struct wiphy *wiphy, struct
net_device *dev, u16 reason_co
/*Invalidate u8WLANChannel value on wlan0 disconnect*/
pstrWFIDrv = (struct host_if_drv *)priv->hWILCWFIDrv;
- if (!pstrWFIDrv->u8P2PConnect)
+ if (!pstrWFIDrv->p2p_connect)
u8WLANChannel = INVALID_CHANNEL;
linux_wlan_set_bssid(priv->dev, NullBssid);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 44/64] staging: wilc1000: rename u32RcvdChCount of struct user_scan_req
From: Leo Kim
This patch renames u32RcvdChCount of struct user_scan_req to rcvd_ch_cnt
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 14 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 3e7c6e4..f465233 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -843,7 +843,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
PRINT_D(HOSTINF_DBG, "Setting SCAN params\n");
- hif_drv->usr_scan_req.u32RcvdChCount = 0;
+ hif_drv->usr_scan_req.rcvd_ch_cnt = 0;
strWIDList[u32WidsCount].id = (u16)WID_SSID_PROBE_REQ;
strWIDList[u32WidsCount].type = WID_STR;
@@ -1414,7 +1414,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv
*hif_drv,
goto done;
}
- for (i = 0; i < hif_drv->usr_scan_req.u32RcvdChCount; i++) {
+ for (i = 0; i < hif_drv->usr_scan_req.rcvd_ch_cnt; i++) {
if ((hif_drv->usr_scan_req.net_info[i].au8bssid) &&
(pstrNetworkInfo->au8bssid)) {
if
(memcmp(hif_drv->usr_scan_req.net_info[i].au8bssid,
@@ -1434,15 +1434,15 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv
*hif_drv,
if (bNewNtwrkFound) {
PRINT_D(HOSTINF_DBG, "New network found\n");
- if (hif_drv->usr_scan_req.u32RcvdChCount <
MAX_NUM_SCANNED_NETWORKS) {
-
hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].s8rssi =
pstrNetworkInfo->s8rssi;
+ if (hif_drv->usr_scan_req.rcvd_ch_cnt <
MAX_NUM_SCANNED_NETWORKS) {
+
hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].s8rssi =
pstrNetworkInfo->s8rssi;
- if
(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid
&&
+ if
(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].au8bssid &&
pstrNetworkInfo->au8bssid) {
-
memcpy(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid,
+
memcpy(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.rcvd_ch_cnt].au8bssid,
pstrNetworkInfo->au8bssid, 6);
- hif_drv->usr_scan_req.u32RcvdChCount++;
+ hif_drv->usr_scan_req.rcvd_ch_cnt++;
pstrNetworkInfo->bNewNetwork = true;
pJoinParams =
host_int_ParseJoinBssParam(pstrNetworkInfo);
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index f94bba6..f824866 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -198,7 +198,7 @@ struct hidden_network {
struct user_scan_req {
wilc_scan_result scan_result;
void *arg;
- u32 u32RcvdChCount;
+ u32 rcvd_ch_cnt;
struct found_net_info net_info[MAX_NUM_SCANNED_NETWORKS];
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 49/64] staging: wilc1000: rename au8BSSID of struct add_sta_param
From: Leo Kim
This patch renames au8BSSID of struct add_sta_param to bssid
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 ++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 00f2717..2cf3ed5 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2308,7 +2308,7 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
pu8CurrByte = pu8Buffer;
PRINT_D(HOSTINF_DBG, "Packing STA params\n");
- memcpy(pu8CurrByte, pstrStationParam->au8BSSID, ETH_ALEN);
+ memcpy(pu8CurrByte, pstrStationParam->bssid, ETH_ALEN);
pu8CurrByte += ETH_ALEN;
*pu8CurrByte++ = pstrStationParam->u16AssocID & 0xFF;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 60dcc36..58e4f92 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -288,7 +288,7 @@ struct host_if_drv {
};
struct add_sta_param {
- u8 au8BSSID[ETH_ALEN];
+ u8 bssid[ETH_ALEN];
u16 u16AssocID;
u8 u8NumRates;
const u8 *pu8Rates;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 4828deb..2ec85f0 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -2995,7 +2995,7 @@ static int add_station(struct wiphy *wiphy, struct
net_device *dev,
nic = netdev_priv(dev);
if (nic->iftype == AP_MODE || nic->iftype == GO_MODE) {
- memcpy(strStaParams.au8BSSID, mac, ETH_ALEN);
+ memcpy(strStaParams.bssid, mac, ETH_ALEN);
memcpy(priv->assoc_stainfo.au8Sta_AssociatedBss[params->aid],
mac, ETH_ALEN);
strStaParams.u16AssocID = params->aid;
strStaParams.u8NumRates = params->supported_rates_len;
@@ -3109,13 +3109,15 @@ static int change_station(struct wiphy *wiphy, struct
net_device *dev,
nic = netdev_priv(dev);
if (nic->iftype == AP_MODE || nic->iftype == GO_MODE) {
- memcpy(strStaParams.au8BSSID, mac, ETH_ALEN);
+ memcpy(strStaParams.bssid, mac, ETH_ALEN);
strStaParams.u16AssocID = params->aid;
strStaParams.u8NumRates = params->supported_rates_len;
strStaParams.pu8Rates = params->supported_rates;
- PRINT_D(HOSTAPD_DBG, "BSSID = %x%x%x%x%x%x\n",
strStaParams.au8BSSID[0], strStaParams.au8BSSID[1], strStaParams.au8BSSID[2],
strStaParams.au8BSSID[3], strStaParams.au8BSSID[4],
- strStaParams.au8BSSID[5]);
+ PRINT_D(HOSTAPD_DBG, "BSSID = %x%x%x%x%x%x\n",
+ strStaParams.bssid[0], strStaParams.bssid[1],
+ strStaParams.bssid[2], strStaParams.bssid[3],
+ strStaParams.bssid[4], strStaParams.bssid[5]);
PRINT_D(HOSTAPD_DBG, "ASSOC ID = %d\n",
strStaParams.u16AssocID);
PRINT_D(HOSTAPD_DBG, "Number of supported rates = %d\n",
strStaParams.u8NumRates);
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 41/64] staging: wilc1000: rename u32TxFailureCount of struct rf_info
From: Leo Kim
This patch renames u32TxFailureCount of struct rf_info to tx_fail_cnt
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 4f64ee7..590d8a4 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2162,7 +2162,7 @@ s32 Handle_GetStatistics(struct host_if_drv *hif_drv,
struct rf_info *pstrStatis
strWIDList[u32WidsCount].id = WID_FAILED_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32);
- strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->u32TxFailureCount;
+ strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->tx_fail_cnt;
u32WidsCount++;
result = send_config_pkt(GET_CFG, strWIDList, u32WidsCount,
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index d61b9b7..59b1949 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -57,7 +57,7 @@ struct rf_info {
s8 rssi;
u32 tx_cnt;
u32 rx_cnt;
- u32 u32TxFailureCount;
+ u32 tx_fail_cnt;
};
enum host_if_state {
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 9b7cac3..3060b8d 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1568,8 +1568,8 @@ static int get_station(struct wiphy *wiphy, struct
net_device *dev,
sinfo->signal = strStatistics.rssi;
sinfo->rx_packets = strStatistics.rx_cnt;
- sinfo->tx_packets = strStatistics.tx_cnt +
strStatistics.u32TxFailureCount;
- sinfo->tx_failed= strStatistics.u32TxFailureCount;
+ sinfo->tx_packets = strStatistics.tx_cnt +
strStatistics.tx_fail_cnt;
+ sinfo->tx_failed = strStatistics.tx_fail_cnt;
sinfo->txrate.legacy = strStatistics.link_speed * 10;
if ((strStatistics.link_speed >
TCP_ACK_FILTER_LINK_SPEED_THRESH) &&
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 46/64] staging: wilc1000: rename u32ListenSessionID of struct remain_ch
From: Leo Kim
This patch renames u32ListenSessionID of struct remain_ch to id
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 10 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 6c49091..294f90c 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2489,7 +2489,7 @@ static int Handle_RemainOnChan(struct host_if_drv
*hif_drv,
hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired;
hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready;
hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
- hif_drv->remain_on_ch.u32ListenSessionID =
pstrHostIfRemainOnChan->u32ListenSessionID;
+ hif_drv->remain_on_ch.id = pstrHostIfRemainOnChan->id;
} else {
pstrHostIfRemainOnChan->ch = hif_drv->remain_on_ch.ch;
}
@@ -2617,7 +2617,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv
*hif_drv,
if (hif_drv->remain_on_ch.expired) {
hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.arg,
-
pstrHostIfRemainOnChan->u32ListenSessionID);
+
pstrHostIfRemainOnChan->id);
}
P2P_LISTEN_STATE = 0;
} else {
@@ -2640,7 +2640,7 @@ static void ListenTimerCB(unsigned long arg)
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drv = hif_drv;
- msg.body.remain_on_ch.u32ListenSessionID =
hif_drv->remain_on_ch.u32ListenSessionID;
+ msg.body.remain_on_ch.id = hif_drv->remain_on_ch.id;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result)
@@ -4377,7 +4377,7 @@ s32 host_int_remain_on_channel(struct host_if_drv
*hif_drv, u32 u32SessionID,
msg.body.remain_on_ch.ready = RemainOnChanReady;
msg.body.remain_on_ch.arg = pvUserArg;
msg.body.remain_on_ch.u32duration = u32duration;
- msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
+ msg.body.remain_on_ch.id = u32SessionID;
msg.drv = hif_drv;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
@@ -4402,7 +4402,7 @@ s32 host_int_ListenStateExpired(struct host_if_drv
*hif_drv, u32 u32SessionID)
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
msg.drv = hif_drv;
- msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
+ msg.body.remain_on_ch.id = u32SessionID;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result)
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index c338028..8450e22 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -244,7 +244,7 @@ struct remain_ch {
wilc_remain_on_chan_expired expired;
wilc_remain_on_chan_ready ready;
void *arg;
- u32 u32ListenSessionID;
+ u32 id;
};
struct reg_frame {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 43/64] staging: wilc1000: rename WPAPtk of enum KEY_TYPE
From: Leo Kim
This patch renames WPAPtk of enum KEY_TYPE to WPA_PTK
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index ead99ab..3e7c6e4 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1869,7 +1869,7 @@ _WPARxGtk_end_case_:
break;
- case WPAPtk:
+ case WPA_PTK:
if (pstrHostIFkeyAttr->action & ADDKEY_AP) {
pu8keybuf = kmalloc(PTK_KEY_MSG_LEN + 1, GFP_KERNEL);
if (!pu8keybuf) {
@@ -3216,7 +3216,7 @@ s32 host_int_add_ptk(struct host_if_drv *hif_drv, const
u8 *pu8Ptk,
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_KEY;
- msg.body.key_info.type = WPAPtk;
+ msg.body.key_info.type = WPA_PTK;
if (mode == AP_MODE) {
msg.body.key_info.action = ADDKEY_AP;
msg.body.key_info.attr.wpa.index = u8Idx;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index b3e74d1..f94bba6 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -164,7 +164,7 @@ enum conn_event {
enum KEY_TYPE {
WEP,
WPA_RX_GTK,
- WPAPtk,
+ WPA_PTK,
PMKSA,
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 42/64] staging: wilc1000: rename WPARxGtk of enum KEY_TYPE
From: Leo Kim
This patch renames WPARxGtk of enum KEY_TYPE to WPA_RX_GTK
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 4 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 590d8a4..ead99ab 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1795,7 +1795,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
up(&hif_drv->sem_test_key_block);
break;
- case WPARxGtk:
+ case WPA_RX_GTK:
if (pstrHostIFkeyAttr->action & ADDKEY_AP) {
pu8keybuf = kzalloc(RX_MIC_KEY_MSG_LEN, GFP_KERNEL);
if (!pu8keybuf) {
@@ -3285,7 +3285,7 @@ s32 host_int_add_rx_gtk(struct host_if_drv *hif_drv,
const u8 *pu8RxGtk,
}
msg.id = HOST_IF_MSG_KEY;
- msg.body.key_info.type = WPARxGtk;
+ msg.body.key_info.type = WPA_RX_GTK;
msg.drv = hif_drv;
if (mode == AP_MODE) {
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 59b1949..b3e74d1 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -163,7 +163,7 @@ enum conn_event {
enum KEY_TYPE {
WEP,
- WPARxGtk,
+ WPA_RX_GTK,
WPAPtk,
PMKSA,
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 36/64] staging: wilc1000: host_interface.h: move local define variables
From: Leo Kim
This patch move local define variables to local define position.
- ACTION
- PROBE_REQ
- PROBE_RESP
- ACTION_FRM_IDX
- PROBE_REQ_IDX
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.h | 14 +-
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 9595d48..2dfd7f0 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -10,8 +10,12 @@
#define STATION_MODE 0x02
#define GO_MODE0x03
#define CLIENT_MODE0x04
+#define ACTION 0xD0
+#define PROBE_REQ 0x40
+#define PROBE_RESP 0x50
-
+#define ACTION_FRM_IDX 0
+#define PROBE_REQ_IDX 1
#define MAX_NUM_STA9
#define ACTIVE_SCAN_TIME 10
#define PASSIVE_SCAN_TIME 1200
@@ -249,14 +253,6 @@ struct reg_frame {
u8 reg_id;
};
-
-#define ACTION 0xD0
-#define PROBE_REQ 0x40
-#define PROBE_RESP 0x50
-#define ACTION_FRM_IDX 0
-#define PROBE_REQ_IDX 1
-
-
enum p2p_listen_state {
P2P_IDLE,
P2P_LISTEN,
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 38/64] staging: wilc1000: rename s8RSSI of struct rf_info
From: Leo Kim
This patch renames s8RSSI of struct rf_info to rssi
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 5399115..bee1f7f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2144,7 +2144,7 @@ s32 Handle_GetStatistics(struct host_if_drv *hif_drv,
struct rf_info *pstrStatis
strWIDList[u32WidsCount].id = WID_RSSI;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->s8RSSI;
+ strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->rssi;
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index cef952a..25f748f 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -54,7 +54,7 @@
struct rf_info {
u8 link_speed;
- s8 s8RSSI;
+ s8 rssi;
u32 u32TxCount;
u32 u32RxCount;
u32 u32TxFailureCount;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 29b769f..632daa8 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1566,7 +1566,7 @@ static int get_station(struct wiphy *wiphy, struct
net_device *dev,
BIT(NL80211_STA_INFO_TX_FAILED)
|
BIT(NL80211_STA_INFO_TX_BITRATE);
- sinfo->signal = strStatistics.s8RSSI;
+ sinfo->signal = strStatistics.rssi;
sinfo->rx_packets = strStatistics.u32RxCount;
sinfo->tx_packets = strStatistics.u32TxCount +
strStatistics.u32TxFailureCount;
sinfo->tx_failed= strStatistics.u32TxFailureCount;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 37/64] staging: wilc1000: rename u8LinkSpeed of struct rf_info
From: Leo Kim
This patch renames u8LinkSpeed of struct rf_info to link_speed
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 7 ---
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 3b24a27..5399115 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2138,7 +2138,7 @@ s32 Handle_GetStatistics(struct host_if_drv *hif_drv,
struct rf_info *pstrStatis
strWIDList[u32WidsCount].id = WID_LINKSPEED;
strWIDList[u32WidsCount].type = WID_CHAR;
strWIDList[u32WidsCount].size = sizeof(char);
- strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->u8LinkSpeed;
+ strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->link_speed;
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_RSSI;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 2dfd7f0..cef952a 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -53,7 +53,7 @@
#define NUM_CONCURRENT_IFC 2
struct rf_info {
- u8 u8LinkSpeed;
+ u8 link_speed;
s8 s8RSSI;
u32 u32TxCount;
u32 u32RxCount;
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 3e95017..29b769f 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1570,11 +1570,12 @@ static int get_station(struct wiphy *wiphy, struct
net_device *dev,
sinfo->rx_packets = strStatistics.u32RxCount;
sinfo->tx_packets = strStatistics.u32TxCount +
strStatistics.u32TxFailureCount;
sinfo->tx_failed= strStatistics.u32TxFailureCount;
- sinfo->txrate.legacy = strStatistics.u8LinkSpeed * 10;
+ sinfo->txrate.legacy = strStatistics.link_speed * 10;
- if ((strStatistics.u8LinkSpeed >
TCP_ACK_FILTER_LINK_SPEED_THRESH) && (strStatistics.u8LinkSpeed !=
DEFAULT_LINK_SPEED))
+ if ((strStatistics.link_speed >
TCP_ACK_FILTER_LINK_SPEED_THRESH) &&
+ (strStatistics.link_speed != DEFAULT_LINK_SPEED))
Enable_TCP_ACK_Filter(true);
- else if (strStatistics.u8LinkSpeed != DEFAULT_LINK_SPEED)
+ else if (strStatistics.link_speed != DEFAULT_LINK_SPEED)
Enable_TCP_ACK_Filter(false);
PRINT_D(CORECONFIG_DBG, "*** stats[%d][%d][%d][%d][%d]\n",
sinfo->signal, sinfo->rx_packets, sinfo->tx_packets,
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 40/64] staging: wilc1000: rename u32RxCount of struct rf_info
From: Leo Kim
This patch renames u32RxCount of struct rf_info to rx_cnt
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 0d220a8..4f64ee7 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2156,7 +2156,7 @@ s32 Handle_GetStatistics(struct host_if_drv *hif_drv,
struct rf_info *pstrStatis
strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32);
- strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->u32RxCount;
+ strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->rx_cnt;
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_FAILED_COUNT;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 9d31c4e..d61b9b7 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -56,7 +56,7 @@ struct rf_info {
u8 link_speed;
s8 rssi;
u32 tx_cnt;
- u32 u32RxCount;
+ u32 rx_cnt;
u32 u32TxFailureCount;
};
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 73cec4b..9b7cac3 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1567,7 +1567,7 @@ static int get_station(struct wiphy *wiphy, struct
net_device *dev,
BIT(NL80211_STA_INFO_TX_BITRATE);
sinfo->signal = strStatistics.rssi;
- sinfo->rx_packets = strStatistics.u32RxCount;
+ sinfo->rx_packets = strStatistics.rx_cnt;
sinfo->tx_packets = strStatistics.tx_cnt +
strStatistics.u32TxFailureCount;
sinfo->tx_failed= strStatistics.u32TxFailureCount;
sinfo->txrate.legacy = strStatistics.link_speed * 10;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 39/64] staging: wilc1000: rename u32TxCount of struct rf_info
From: Leo Kim
This patch renames u32TxCount of struct rf_info to tx_cnt
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index bee1f7f..0d220a8 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2150,7 +2150,7 @@ s32 Handle_GetStatistics(struct host_if_drv *hif_drv,
struct rf_info *pstrStatis
strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
strWIDList[u32WidsCount].size = sizeof(u32);
- strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->u32TxCount;
+ strWIDList[u32WidsCount].val = (s8 *)&pstrStatistics->tx_cnt;
u32WidsCount++;
strWIDList[u32WidsCount].id = WID_RECEIVED_FRAGMENT_COUNT;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 25f748f..9d31c4e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -55,7 +55,7 @@
struct rf_info {
u8 link_speed;
s8 rssi;
- u32 u32TxCount;
+ u32 tx_cnt;
u32 u32RxCount;
u32 u32TxFailureCount;
};
diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
index 632daa8..73cec4b 100644
--- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
@@ -1568,7 +1568,7 @@ static int get_station(struct wiphy *wiphy, struct
net_device *dev,
sinfo->signal = strStatistics.rssi;
sinfo->rx_packets = strStatistics.u32RxCount;
- sinfo->tx_packets = strStatistics.u32TxCount +
strStatistics.u32TxFailureCount;
+ sinfo->tx_packets = strStatistics.tx_cnt +
strStatistics.u32TxFailureCount;
sinfo->tx_failed= strStatistics.u32TxFailureCount;
sinfo->txrate.legacy = strStatistics.link_speed * 10;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 35/64] staging: wilc1000: rename u32UserConnectPvoid of struct user_conn_req
From: Leo Kim
This patch renames u32UserConnectPvoid of struct user_conn_req to arg
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 10 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index f1f1ef4..3b24a27 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1030,7 +1030,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
hif_drv->usr_conn_req.u8security = pstrHostIFconnectAttr->security;
hif_drv->usr_conn_req.tenuAuth_type = pstrHostIFconnectAttr->auth_type;
hif_drv->usr_conn_req.conn_result = pstrHostIFconnectAttr->result;
- hif_drv->usr_conn_req.u32UserConnectPvoid = pstrHostIFconnectAttr->arg;
+ hif_drv->usr_conn_req.arg = pstrHostIFconnectAttr->arg;
strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
strWIDList[u32WidsCount].type = WID_INT;
@@ -1351,7 +1351,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv
*hif_drv)
&strConnectInfo,
MAC_DISCONNECTED,
NULL,
-
hif_drv->usr_conn_req.u32UserConnectPvoid);
+ hif_drv->usr_conn_req.arg);
kfree(strConnectInfo.pu8ReqIEs);
strConnectInfo.pu8ReqIEs = NULL;
@@ -1599,7 +1599,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
&strConnectInfo,
u8MacStatus,
NULL,
-
hif_drv->usr_conn_req.u32UserConnectPvoid);
+
hif_drv->usr_conn_req.arg);
if ((u8MacStatus == MAC_CONNECTED) &&
(strConnectInfo.u16ConnectStatus ==
SUCCESSFUL_STATUSCODE)) {
@@ -1652,7 +1652,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
NULL,
0,
&strDisconnectNotifInfo,
-
hif_drv->usr_conn_req.u32UserConnectPvoid);
+
hif_drv->usr_conn_req.arg);
} else {
PRINT_ER("Connect result callback function is
NULL\n");
}
@@ -2017,7 +2017,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
NULL,
0,
&strDisconnectNotifInfo,
-
hif_drv->usr_conn_req.u32UserConnectPvoid);
+
hif_drv->usr_conn_req.arg);
} else {
PRINT_ER("usr_conn_req.conn_result = NULL\n");
}
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 3afe432..9595d48 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -208,7 +208,7 @@ struct user_conn_req {
size_t ies_len;
wilc_connect_result conn_result;
bool ht_capable;
- void *u32UserConnectPvoid;
+ void *arg;
};
struct drv_handler {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 34/64] staging: wilc1000: rename IsHTCapable of struct user_conn_req
From: Leo Kim
This patch renames IsHTCapable of struct user_conn_req to ht_capable
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 2 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index dc94d00..f1f1ef4 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1143,7 +1143,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
*(pu8CurrByte++) = ptstrJoinBssParam->uapsd_cap;
*(pu8CurrByte++) = ptstrJoinBssParam->ht_capable;
- hif_drv->usr_conn_req.IsHTCapable = ptstrJoinBssParam->ht_capable;
+ hif_drv->usr_conn_req.ht_capable = ptstrJoinBssParam->ht_capable;
*(pu8CurrByte++) = ptstrJoinBssParam->rsn_found;
PRINT_D(HOSTINF_DBG, "* rsn found %d*\n", *(pu8CurrByte - 1));
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 0363068..3afe432 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -207,7 +207,7 @@ struct user_conn_req {
u8 *ies;
size_t ies_len;
wilc_connect_result conn_result;
- bool IsHTCapable;
+ bool ht_capable;
void *u32UserConnectPvoid;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 32/64] staging: wilc1000: rename ConnReqIEsLen of struct user_conn_req
From: Leo Kim
This patch renames ConnReqIEsLen of struct user_conn_req to ies_len
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 26 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 667bd2d..bc899e8 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1019,7 +1019,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
hif_drv->usr_conn_req.pu8ssid[pstrHostIFconnectAttr->ssid_len]
= '\0';
}
- hif_drv->usr_conn_req.ConnReqIEsLen = pstrHostIFconnectAttr->ies_len;
+ hif_drv->usr_conn_req.ies_len = pstrHostIFconnectAttr->ies_len;
if (pstrHostIFconnectAttr->ies) {
hif_drv->usr_conn_req.ies =
kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);
memcpy(hif_drv->usr_conn_req.ies,
@@ -1054,11 +1054,11 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
strWIDList[u32WidsCount].val = hif_drv->usr_conn_req.ies;
- strWIDList[u32WidsCount].size =
hif_drv->usr_conn_req.ConnReqIEsLen;
+ strWIDList[u32WidsCount].size = hif_drv->usr_conn_req.ies_len;
u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
- info_element_size = hif_drv->usr_conn_req.ConnReqIEsLen;
+ info_element_size = hif_drv->usr_conn_req.ies_len;
info_element = kmalloc(info_element_size, GFP_KERNEL);
memcpy(info_element, hif_drv->usr_conn_req.ies,
info_element_size);
@@ -1340,11 +1340,11 @@ static s32 Handle_ConnectTimeout(struct host_if_drv
*hif_drv)
}
if (hif_drv->usr_conn_req.ies) {
- strConnectInfo.ReqIEsLen =
hif_drv->usr_conn_req.ConnReqIEsLen;
- strConnectInfo.pu8ReqIEs =
kmalloc(hif_drv->usr_conn_req.ConnReqIEsLen, GFP_KERNEL);
+ strConnectInfo.ReqIEsLen =
hif_drv->usr_conn_req.ies_len;
+ strConnectInfo.pu8ReqIEs =
kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);
memcpy(strConnectInfo.pu8ReqIEs,
hif_drv->usr_conn_req.ies,
- hif_drv->usr_conn_req.ConnReqIEsLen);
+ hif_drv->usr_conn_req.ies_len);
}
hif_drv->usr_conn_req.pfUserConnectResult(CONN_DISCONN_EVENT_CONN_RESP,
@@ -1374,7 +1374,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv
*hif_drv)
hif_drv->usr_conn_req.ssid_len = 0;
kfree(hif_drv->usr_conn_req.pu8ssid);
kfree(hif_drv->usr_conn_req.pu8bssid);
- hif_drv->usr_conn_req.ConnReqIEsLen = 0;
+ hif_drv->usr_conn_req.ies_len = 0;
kfree(hif_drv->usr_conn_req.ies);
eth_zero_addr(u8ConnectedSSID);
@@ -1587,11 +1587,11 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
}
if (hif_drv->usr_conn_req.ies) {
- strConnectInfo.ReqIEsLen =
hif_drv->usr_conn_req.ConnReqIEsLen;
- strConnectInfo.pu8ReqIEs =
kmalloc(hif_drv->usr_conn_req.ConnReqIEsLen, GFP_KERNEL);
+ strConnectInfo.ReqIEsLen =
hif_drv->usr_conn_req.ies_len;
+ strConnectInfo.pu8ReqIEs =
kmalloc(hif_drv->usr_conn_req.ies_len, GFP_KERNEL);
memcpy(strConnectInfo.pu8ReqIEs,
hif_drv->usr_conn_req.ies,
- hif_drv->usr_conn_req.ConnReqIEsLen);
+ hif_drv->usr_conn_req.ies_len);
}
del_timer(&hif_drv->connect_timer);
@@ -1626,7 +1626,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
hif_drv->usr_conn_req.ssid_len = 0;
kfree(hif_drv->usr_conn_req.pu8ssid);
kfree(hif_drv->usr_conn_req.pu8bssid);
- hif_drv->usr_conn_req.ConnReqIEsLen = 0;
+ hif_drv->usr_conn_req.ies_len = 0;
kfree(hif_drv->usr_conn_req.ies);
} else if ((u8MacStatus == MAC_DISCONNECTED) &&
(hif_drv->hif_state == HOST_IF_CONNECTED)) {
@@ -1662,7 +1662,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
hif_drv->usr_conn_req.s
[PATCH V2 33/64] staging: wilc1000: rename pfUserConnectResult of struct user_conn_req
From: Leo Kim
This patch renames pfUserConnectResult of struct user_conn_req to conn_result
to avoid CamelCase naming convention.
And, some comments modification that has been included
name 'pfUserConnectResult'.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 57 +--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index bc899e8..dc94d00 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1029,7 +1029,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
hif_drv->usr_conn_req.u8security = pstrHostIFconnectAttr->security;
hif_drv->usr_conn_req.tenuAuth_type = pstrHostIFconnectAttr->auth_type;
- hif_drv->usr_conn_req.pfUserConnectResult =
pstrHostIFconnectAttr->result;
+ hif_drv->usr_conn_req.conn_result = pstrHostIFconnectAttr->result;
hif_drv->usr_conn_req.u32UserConnectPvoid = pstrHostIFconnectAttr->arg;
strWIDList[u32WidsCount].id = WID_SUCCESS_FRAME_COUNT;
@@ -1333,7 +1333,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv
*hif_drv)
memset(&strConnectInfo, 0, sizeof(tstrConnectInfo));
- if (hif_drv->usr_conn_req.pfUserConnectResult) {
+ if (hif_drv->usr_conn_req.conn_result) {
if (hif_drv->usr_conn_req.pu8bssid) {
memcpy(strConnectInfo.au8bssid,
hif_drv->usr_conn_req.pu8bssid, 6);
@@ -1347,11 +1347,11 @@ static s32 Handle_ConnectTimeout(struct host_if_drv
*hif_drv)
hif_drv->usr_conn_req.ies_len);
}
-
hif_drv->usr_conn_req.pfUserConnectResult(CONN_DISCONN_EVENT_CONN_RESP,
- &strConnectInfo,
- MAC_DISCONNECTED,
- NULL,
-
hif_drv->usr_conn_req.u32UserConnectPvoid);
+ hif_drv->usr_conn_req.conn_result(CONN_DISCONN_EVENT_CONN_RESP,
+ &strConnectInfo,
+ MAC_DISCONNECTED,
+ NULL,
+
hif_drv->usr_conn_req.u32UserConnectPvoid);
kfree(strConnectInfo.pu8ReqIEs);
strConnectInfo.pu8ReqIEs = NULL;
@@ -1500,7 +1500,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
(hif_drv->hif_state == HOST_IF_CONNECTED) ||
hif_drv->usr_scan_req.scan_result) {
if (!pstrRcvdGnrlAsyncInfo->buffer ||
- !hif_drv->usr_conn_req.pfUserConnectResult) {
+ !hif_drv->usr_conn_req.conn_result) {
PRINT_ER("driver is null\n");
return -EINVAL;
}
@@ -1595,11 +1595,11 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
}
del_timer(&hif_drv->connect_timer);
-
hif_drv->usr_conn_req.pfUserConnectResult(CONN_DISCONN_EVENT_CONN_RESP,
-
&strConnectInfo,
- u8MacStatus,
- NULL,
-
hif_drv->usr_conn_req.u32UserConnectPvoid);
+
hif_drv->usr_conn_req.conn_result(CONN_DISCONN_EVENT_CONN_RESP,
+ &strConnectInfo,
+ u8MacStatus,
+ NULL,
+
hif_drv->usr_conn_req.u32UserConnectPvoid);
if ((u8MacStatus == MAC_CONNECTED) &&
(strConnectInfo.u16ConnectStatus ==
SUCCESSFUL_STATUSCODE)) {
@@ -1644,15 +1644,15 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
strDisconnectNotifInfo.ie = NULL;
strDisconnectNotifInfo.ie_len = 0;
- if (hif_drv->usr_conn_req.pfUserConnectResult) {
+ if (hif_drv->usr_conn_req.conn_result) {
g_obtainingIP = false;
host_int_set_power_mgmt(hif_drv, 0, 0);
-
hif_drv->usr_conn_req.pfUserConnectResult(CONN_DISCONN_EVENT_DISCONN_NOTIF,
-
[PATCH V2 31/64] staging: wilc1000: rename pu8ConnReqIEs of struct user_conn_req
From: Leo Kim
This patch renames pu8ConnReqIEs of struct user_conn_req to ies
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 24
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 9f70a85..667bd2d 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1021,8 +1021,8 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
hif_drv->usr_conn_req.ConnReqIEsLen = pstrHostIFconnectAttr->ies_len;
if (pstrHostIFconnectAttr->ies) {
- hif_drv->usr_conn_req.pu8ConnReqIEs =
kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);
- memcpy(hif_drv->usr_conn_req.pu8ConnReqIEs,
+ hif_drv->usr_conn_req.ies =
kmalloc(pstrHostIFconnectAttr->ies_len, GFP_KERNEL);
+ memcpy(hif_drv->usr_conn_req.ies,
pstrHostIFconnectAttr->ies,
pstrHostIFconnectAttr->ies_len);
}
@@ -1053,14 +1053,14 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
{
strWIDList[u32WidsCount].id = WID_INFO_ELEMENT_ASSOCIATE;
strWIDList[u32WidsCount].type = WID_BIN_DATA;
- strWIDList[u32WidsCount].val =
hif_drv->usr_conn_req.pu8ConnReqIEs;
+ strWIDList[u32WidsCount].val = hif_drv->usr_conn_req.ies;
strWIDList[u32WidsCount].size =
hif_drv->usr_conn_req.ConnReqIEsLen;
u32WidsCount++;
if (memcmp("DIRECT-", pstrHostIFconnectAttr->ssid, 7)) {
info_element_size = hif_drv->usr_conn_req.ConnReqIEsLen;
info_element = kmalloc(info_element_size, GFP_KERNEL);
- memcpy(info_element,
hif_drv->usr_conn_req.pu8ConnReqIEs,
+ memcpy(info_element, hif_drv->usr_conn_req.ies,
info_element_size);
}
}
@@ -1339,11 +1339,11 @@ static s32 Handle_ConnectTimeout(struct host_if_drv
*hif_drv)
hif_drv->usr_conn_req.pu8bssid, 6);
}
- if (hif_drv->usr_conn_req.pu8ConnReqIEs) {
+ if (hif_drv->usr_conn_req.ies) {
strConnectInfo.ReqIEsLen =
hif_drv->usr_conn_req.ConnReqIEsLen;
strConnectInfo.pu8ReqIEs =
kmalloc(hif_drv->usr_conn_req.ConnReqIEsLen, GFP_KERNEL);
memcpy(strConnectInfo.pu8ReqIEs,
- hif_drv->usr_conn_req.pu8ConnReqIEs,
+ hif_drv->usr_conn_req.ies,
hif_drv->usr_conn_req.ConnReqIEsLen);
}
@@ -1375,7 +1375,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv
*hif_drv)
kfree(hif_drv->usr_conn_req.pu8ssid);
kfree(hif_drv->usr_conn_req.pu8bssid);
hif_drv->usr_conn_req.ConnReqIEsLen = 0;
- kfree(hif_drv->usr_conn_req.pu8ConnReqIEs);
+ kfree(hif_drv->usr_conn_req.ies);
eth_zero_addr(u8ConnectedSSID);
@@ -1586,11 +1586,11 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
}
}
- if (hif_drv->usr_conn_req.pu8ConnReqIEs) {
+ if (hif_drv->usr_conn_req.ies) {
strConnectInfo.ReqIEsLen =
hif_drv->usr_conn_req.ConnReqIEsLen;
strConnectInfo.pu8ReqIEs =
kmalloc(hif_drv->usr_conn_req.ConnReqIEsLen, GFP_KERNEL);
memcpy(strConnectInfo.pu8ReqIEs,
- hif_drv->usr_conn_req.pu8ConnReqIEs,
+ hif_drv->usr_conn_req.ies,
hif_drv->usr_conn_req.ConnReqIEsLen);
}
@@ -1627,7 +1627,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
kfree(hif_drv->usr_conn_req.pu8ssid);
kfree(hif_drv->usr_conn_req.pu8bssid);
hif_drv->usr_conn_req.ConnReqIEsLen = 0;
- kfree(hif_drv->usr_conn_req.pu8ConnReqIEs);
+ kfree(hif_drv->usr_conn_req.ies);
} else if ((u8MacStatus == MAC_DISCONNECTED) &&
(hif_drv->hif_state == HOST_IF_CONNECTED)) {
PRINT_D(HOSTINF_DBG, "Received MAC_DISCONNECTED from
the FW\n");
@@ -1663,7 +1663,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
kfree(hif_drv->usr_conn_req.pu8ssid);
kfree(hif_drv->usr_conn_req.pu8bssid);
hif_drv->usr_conn_req.ConnReqIEsL
[PATCH V2 30/64] staging: wilc1000: rename ssidLen of struct user_conn_req
From: Leo Kim
This patch renames ssidLen of struct user_conn_req to ssid_len
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 10 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 35a1262..9f70a85 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1010,7 +1010,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
memcpy(hif_drv->usr_conn_req.pu8bssid,
pstrHostIFconnectAttr->bssid, 6);
}
- hif_drv->usr_conn_req.ssidLen = pstrHostIFconnectAttr->ssid_len;
+ hif_drv->usr_conn_req.ssid_len = pstrHostIFconnectAttr->ssid_len;
if (pstrHostIFconnectAttr->ssid) {
hif_drv->usr_conn_req.pu8ssid =
kmalloc(pstrHostIFconnectAttr->ssid_len + 1, GFP_KERNEL);
memcpy(hif_drv->usr_conn_req.pu8ssid,
@@ -1371,7 +1371,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv
*hif_drv)
if (result)
PRINT_ER("Failed to send dissconect config packet\n");
- hif_drv->usr_conn_req.ssidLen = 0;
+ hif_drv->usr_conn_req.ssid_len = 0;
kfree(hif_drv->usr_conn_req.pu8ssid);
kfree(hif_drv->usr_conn_req.pu8bssid);
hif_drv->usr_conn_req.ConnReqIEsLen = 0;
@@ -1623,7 +1623,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
kfree(strConnectInfo.pu8ReqIEs);
strConnectInfo.pu8ReqIEs = NULL;
- hif_drv->usr_conn_req.ssidLen = 0;
+ hif_drv->usr_conn_req.ssid_len = 0;
kfree(hif_drv->usr_conn_req.pu8ssid);
kfree(hif_drv->usr_conn_req.pu8bssid);
hif_drv->usr_conn_req.ConnReqIEsLen = 0;
@@ -1659,7 +1659,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
eth_zero_addr(hif_drv->assoc_bssid);
- hif_drv->usr_conn_req.ssidLen = 0;
+ hif_drv->usr_conn_req.ssid_len = 0;
kfree(hif_drv->usr_conn_req.pu8ssid);
kfree(hif_drv->usr_conn_req.pu8bssid);
hif_drv->usr_conn_req.ConnReqIEsLen = 0;
@@ -2023,7 +2023,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
eth_zero_addr(hif_drv->assoc_bssid);
- hif_drv->usr_conn_req.ssidLen = 0;
+ hif_drv->usr_conn_req.ssid_len = 0;
kfree(hif_drv->usr_conn_req.pu8ssid);
kfree(hif_drv->usr_conn_req.pu8bssid);
hif_drv->usr_conn_req.ConnReqIEsLen = 0;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index dcb68ea..69ce8f1 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -203,7 +203,7 @@ struct user_conn_req {
u8 *pu8ssid;
u8 u8security;
enum AUTHTYPE tenuAuth_type;
- size_t ssidLen;
+ size_t ssid_len;
u8 *pu8ConnReqIEs;
size_t ConnReqIEsLen;
wilc_connect_result pfUserConnectResult;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 29/64] staging: wilc1000: rename astrFoundNetworkInfo of struct user_scan_req
From: Leo Kim
This patch renames astrFoundNetworkInfo of struct user_scan_req to net_info
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 14 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 3648e3c..35a1262 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1415,15 +1415,15 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv
*hif_drv,
}
for (i = 0; i < hif_drv->usr_scan_req.u32RcvdChCount; i++) {
- if
((hif_drv->usr_scan_req.astrFoundNetworkInfo[i].au8bssid) &&
+ if ((hif_drv->usr_scan_req.net_info[i].au8bssid) &&
(pstrNetworkInfo->au8bssid)) {
- if
(memcmp(hif_drv->usr_scan_req.astrFoundNetworkInfo[i].au8bssid,
+ if
(memcmp(hif_drv->usr_scan_req.net_info[i].au8bssid,
pstrNetworkInfo->au8bssid, 6) == 0) {
- if (pstrNetworkInfo->s8rssi <=
hif_drv->usr_scan_req.astrFoundNetworkInfo[i].s8rssi) {
+ if (pstrNetworkInfo->s8rssi <=
hif_drv->usr_scan_req.net_info[i].s8rssi) {
PRINT_D(HOSTINF_DBG, "Network
previously discovered\n");
goto done;
} else {
-
hif_drv->usr_scan_req.astrFoundNetworkInfo[i].s8rssi = pstrNetworkInfo->s8rssi;
+
hif_drv->usr_scan_req.net_info[i].s8rssi = pstrNetworkInfo->s8rssi;
bNewNtwrkFound = false;
break;
}
@@ -1435,11 +1435,11 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv
*hif_drv,
PRINT_D(HOSTINF_DBG, "New network found\n");
if (hif_drv->usr_scan_req.u32RcvdChCount <
MAX_NUM_SCANNED_NETWORKS) {
-
hif_drv->usr_scan_req.astrFoundNetworkInfo[hif_drv->usr_scan_req.u32RcvdChCount].s8rssi
= pstrNetworkInfo->s8rssi;
+
hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].s8rssi =
pstrNetworkInfo->s8rssi;
- if
(hif_drv->usr_scan_req.astrFoundNetworkInfo[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid
&&
+ if
(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid
&&
pstrNetworkInfo->au8bssid) {
-
memcpy(hif_drv->usr_scan_req.astrFoundNetworkInfo[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid,
+
memcpy(hif_drv->usr_scan_req.net_info[hif_drv->usr_scan_req.u32RcvdChCount].au8bssid,
pstrNetworkInfo->au8bssid, 6);
hif_drv->usr_scan_req.u32RcvdChCount++;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 058ea17..dcb68ea 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -195,7 +195,7 @@ struct user_scan_req {
wilc_scan_result scan_result;
void *arg;
u32 u32RcvdChCount;
- struct found_net_info astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS];
+ struct found_net_info net_info[MAX_NUM_SCANNED_NETWORKS];
};
struct user_conn_req {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 26/64] staging: wilc1000: remove warnings line over 80 characters
From: Leo Kim This patch removes the warnings reported by checkpatch.pl for line over 80 characters. Signed-off-by: Leo Kim Signed-off-by: Glen Lee --- drivers/staging/wilc1000/host_interface.h | 116 +++--- 1 file changed, 74 insertions(+), 42 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.h b/drivers/staging/wilc1000/host_interface.h index 2050fbe..486c647 100644 --- a/drivers/staging/wilc1000/host_interface.h +++ b/drivers/staging/wilc1000/host_interface.h @@ -316,82 +316,114 @@ int host_int_add_wep_key_bss_sta(struct host_if_drv *hif_drv, int host_int_add_wep_key_bss_ap(struct host_if_drv *hif_drv, const u8 *key, u8 len, u8 index, u8 mode, enum AUTHTYPE auth_type); -s32 host_int_add_ptk(struct host_if_drv *hWFIDrv, const u8 *pu8Ptk, u8 u8PtkKeylen, -const u8 *mac_addr, const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode, u8 u8Idx); -s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac, u32 *pu32InactiveTime); -s32 host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk, u8 u8GtkKeylen, - u8 u8KeyIdx, u32 u32KeyRSClen, const u8 *KeyRSC, - const u8 *pu8RxMic, const u8 *pu8TxMic, u8 mode, u8 u8Ciphermode); -s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen, u8 *pu8TxGtk, u8 u8KeyIdx); -s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv, struct host_if_pmkid_attr *pu8PmkidInfoArray); +s32 host_int_add_ptk(struct host_if_drv *hWFIDrv, const u8 *pu8Ptk, +u8 u8PtkKeylen, const u8 *mac_addr, +const u8 *pu8RxMic, const u8 *pu8TxMic, +u8 mode, u8 u8Ciphermode, u8 u8Idx); +s32 host_int_get_inactive_time(struct host_if_drv *hWFIDrv, const u8 *mac, + u32 *pu32InactiveTime); +s32 host_int_add_rx_gtk(struct host_if_drv *hWFIDrv, const u8 *pu8RxGtk, + u8 u8GtkKeylen, u8 u8KeyIdx, + u32 u32KeyRSClen, const u8 *KeyRSC, + const u8 *pu8RxMic, const u8 *pu8TxMic, + u8 mode, u8 u8Ciphermode); +s32 host_int_add_tx_gtk(struct host_if_drv *hWFIDrv, u8 u8KeyLen, + u8 *pu8TxGtk, u8 u8KeyIdx); +s32 host_int_set_pmkid_info(struct host_if_drv *hWFIDrv, + struct host_if_pmkid_attr *pu8PmkidInfoArray); s32 host_int_get_pmkid_info(struct host_if_drv *hWFIDrv, u8 *pu8PmkidInfoArray, - u32 u32PmkidInfoLen); -s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, u8 *pu8PassPhrase, -u8 u8Psklength); + u32 u32PmkidInfoLen); +s32 host_int_set_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, +u8 *pu8PassPhrase, +u8 u8Psklength); s32 host_int_get_RSNAConfigPSKPassPhrase(struct host_if_drv *hWFIDrv, -u8 *pu8PassPhrase, u8 u8Psklength); +u8 *pu8PassPhrase, u8 u8Psklength); s32 host_int_get_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress); s32 host_int_set_MacAddress(struct host_if_drv *hWFIDrv, u8 *pu8MacAddress); int host_int_wait_msg_queue_idle(void); s32 host_int_set_start_scan_req(struct host_if_drv *hWFIDrv, u8 scanSource); s32 host_int_get_start_scan_req(struct host_if_drv *hWFIDrv, u8 *pu8ScanSource); s32 host_int_set_join_req(struct host_if_drv *hWFIDrv, u8 *pu8bssid, - const u8 *pu8ssid, size_t ssidLen, - const u8 *pu8IEs, size_t IEsLen, - wilc_connect_result pfConnectResult, void *pvUserArg, - u8 u8security, enum AUTHTYPE tenuAuth_type, - u8 u8channel, - void *pJoinParams); + const u8 *pu8ssid, size_t ssidLen, + const u8 *pu8IEs, size_t IEsLen, + wilc_connect_result pfConnectResult, void *pvUserArg, + u8 u8security, enum AUTHTYPE tenuAuth_type, + u8 u8channel, void *pJoinParams); s32 host_int_flush_join_req(struct host_if_drv *hWFIDrv); s32 host_int_disconnect(struct host_if_drv *hWFIDrv, u16 u16ReasonCode); s32 host_int_disconnect_station(struct host_if_drv *hWFIDrv, u8 assoc_id); -s32 host_int_get_assoc_req_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocReqInfo, - u32 u32AssocReqInfoLen); -s32 host_int_get_assoc_res_info(struct host_if_drv *hWFIDrv, u8 *pu8AssocRespInfo, - u32 u32MaxAssocRespInfoLen, u32 *pu32RcvdAssocRespInfoLen); -s32 host_
[PATCH V2 28/64] staging: wilc1000: rename u32UserScanPvoid of struct user_scan_req
From: Leo Kim
This patch renames u32UserScanPvoid of struct user_scan_req to arg
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 12 ++--
drivers/staging/wilc1000/host_interface.h | 3 +--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index a1437e2..3648e3c 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -823,7 +823,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
PRINT_D(HOSTINF_DBG, "Scanning: In [%d] state\n", hif_drv->hif_state);
hif_drv->usr_scan_req.scan_result = pstrHostIFscanAttr->result;
- hif_drv->usr_scan_req.u32UserScanPvoid = pstrHostIFscanAttr->arg;
+ hif_drv->usr_scan_req.arg = pstrHostIFscanAttr->arg;
if ((hif_drv->hif_state >= HOST_IF_SCANNING) &&
(hif_drv->hif_state < HOST_IF_CONNECTED)) {
@@ -971,7 +971,7 @@ static s32 Handle_ScanDone(struct host_if_drv *hif_drv,
if (hif_drv->usr_scan_req.scan_result) {
hif_drv->usr_scan_req.scan_result(enuEvent, NULL,
-
hif_drv->usr_scan_req.u32UserScanPvoid, NULL);
+ hif_drv->usr_scan_req.arg,
NULL);
hif_drv->usr_scan_req.scan_result = NULL;
}
@@ -1448,7 +1448,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv
*hif_drv,
pJoinParams =
host_int_ParseJoinBssParam(pstrNetworkInfo);
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo,
-
hif_drv->usr_scan_req.u32UserScanPvoid,
+
hif_drv->usr_scan_req.arg,
pJoinParams);
}
} else {
@@ -1457,7 +1457,7 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv
*hif_drv,
} else {
pstrNetworkInfo->bNewNetwork = false;
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo,
-
hif_drv->usr_scan_req.u32UserScanPvoid, NULL);
+
hif_drv->usr_scan_req.arg, NULL);
}
}
@@ -2001,7 +2001,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
if (hif_drv->usr_scan_req.scan_result) {
del_timer(&hif_drv->scan_timer);
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED,
NULL,
-
hif_drv->usr_scan_req.u32UserScanPvoid, NULL);
+
hif_drv->usr_scan_req.arg, NULL);
hif_drv->usr_scan_req.scan_result = NULL;
}
@@ -4210,7 +4210,7 @@ s32 host_int_deinit(struct host_if_drv *hif_drv)
if (hif_drv->usr_scan_req.scan_result) {
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_ABORTED, NULL,
-
hif_drv->usr_scan_req.u32UserScanPvoid, NULL);
+ hif_drv->usr_scan_req.arg,
NULL);
hif_drv->usr_scan_req.scan_result = NULL;
}
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index b90d9d2..058ea17 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -193,8 +193,7 @@ struct hidden_network {
struct user_scan_req {
wilc_scan_result scan_result;
- void *u32UserScanPvoid;
-
+ void *arg;
u32 u32RcvdChCount;
struct found_net_info astrFoundNetworkInfo[MAX_NUM_SCANNED_NETWORKS];
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 25/64] staging: wilc1000: rename u16SessionTimeout of struct ba_session_info
From: Leo Kim
This patch renames u16SessionTimeout of struct ba_session_info to time_out
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 8
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 75ad6d0..5bc85dd 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2719,7 +2719,7 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
strHostIfBASessionInfo->bssid[1],
strHostIfBASessionInfo->bssid[2],
strHostIfBASessionInfo->buf_size,
- strHostIfBASessionInfo->u16SessionTimeout,
+ strHostIfBASessionInfo->time_out,
strHostIfBASessionInfo->tid);
wid.id = (u16)WID_11E_P_ACTION_REQ;
@@ -2736,8 +2736,8 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
*ptr++ = 1;
*ptr++ = (strHostIfBASessionInfo->buf_size & 0xFF);
*ptr++ = ((strHostIfBASessionInfo->buf_size >> 16) & 0xFF);
- *ptr++ = (strHostIfBASessionInfo->u16SessionTimeout & 0xFF);
- *ptr++ = ((strHostIfBASessionInfo->u16SessionTimeout >> 16) & 0xFF);
+ *ptr++ = (strHostIfBASessionInfo->time_out & 0xFF);
+ *ptr++ = ((strHostIfBASessionInfo->time_out >> 16) & 0xFF);
*ptr++ = (AddbaTimeout & 0xFF);
*ptr++ = ((AddbaTimeout >> 16) & 0xFF);
*ptr++ = 8;
@@ -2760,7 +2760,7 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
*ptr++ = strHostIfBASessionInfo->tid;
*ptr++ = 8;
*ptr++ = (strHostIfBASessionInfo->buf_size & 0xFF);
- *ptr++ = ((strHostIfBASessionInfo->u16SessionTimeout >> 16) & 0xFF);
+ *ptr++ = ((strHostIfBASessionInfo->time_out >> 16) & 0xFF);
*ptr++ = 3;
result = send_config_pkt(SET_CFG, &wid, 1,
get_id_from_handler(hif_drv));
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index e020a6d..2050fbe 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -232,7 +232,7 @@ struct ba_session_info {
u8 bssid[ETH_ALEN];
u8 tid;
u16 buf_size;
- u16 u16SessionTimeout;
+ u16 time_out;
};
struct remain_ch {
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 27/64] staging: wilc1000: rename pfUserScanResult of struct user_scan_req
From: Leo Kim
This patch renames pfUserScanResult of struct user_scan_req to scan_result
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 56 +++
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 28 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 5bc85dd..a1437e2 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -822,7 +822,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
PRINT_D(HOSTINF_DBG, "Setting SCAN params\n");
PRINT_D(HOSTINF_DBG, "Scanning: In [%d] state\n", hif_drv->hif_state);
- hif_drv->usr_scan_req.pfUserScanResult = pstrHostIFscanAttr->result;
+ hif_drv->usr_scan_req.scan_result = pstrHostIFscanAttr->result;
hif_drv->usr_scan_req.u32UserScanPvoid = pstrHostIFscanAttr->arg;
if ((hif_drv->hif_state >= HOST_IF_SCANNING) &&
@@ -969,10 +969,10 @@ static s32 Handle_ScanDone(struct host_if_drv *hif_drv,
return result;
}
- if (hif_drv->usr_scan_req.pfUserScanResult) {
- hif_drv->usr_scan_req.pfUserScanResult(enuEvent, NULL,
-
hif_drv->usr_scan_req.u32UserScanPvoid, NULL);
- hif_drv->usr_scan_req.pfUserScanResult = NULL;
+ if (hif_drv->usr_scan_req.scan_result) {
+ hif_drv->usr_scan_req.scan_result(enuEvent, NULL,
+
hif_drv->usr_scan_req.u32UserScanPvoid, NULL);
+ hif_drv->usr_scan_req.scan_result = NULL;
}
return result;
@@ -1404,11 +1404,11 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv
*hif_drv,
bNewNtwrkFound = true;
PRINT_INFO(HOSTINF_DBG, "Handling received network info\n");
- if (hif_drv->usr_scan_req.pfUserScanResult) {
+ if (hif_drv->usr_scan_req.scan_result) {
PRINT_D(HOSTINF_DBG, "State: Scanning, parsing network
information received\n");
parse_network_info(pstrRcvdNetworkInfo->buffer,
&pstrNetworkInfo);
if ((!pstrNetworkInfo) ||
- (!hif_drv->usr_scan_req.pfUserScanResult)) {
+ (!hif_drv->usr_scan_req.scan_result)) {
PRINT_ER("driver is null\n");
result = -EINVAL;
goto done;
@@ -1447,17 +1447,17 @@ static s32 Handle_RcvdNtwrkInfo(struct host_if_drv
*hif_drv,
pstrNetworkInfo->bNewNetwork = true;
pJoinParams =
host_int_ParseJoinBssParam(pstrNetworkInfo);
-
hif_drv->usr_scan_req.pfUserScanResult(SCAN_EVENT_NETWORK_FOUND,
pstrNetworkInfo,
-
hif_drv->usr_scan_req.u32UserScanPvoid,
-
pJoinParams);
+
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo,
+
hif_drv->usr_scan_req.u32UserScanPvoid,
+
pJoinParams);
}
} else {
PRINT_WRN(HOSTINF_DBG, "Discovered networks
exceeded max. limit\n");
}
} else {
pstrNetworkInfo->bNewNetwork = false;
-
hif_drv->usr_scan_req.pfUserScanResult(SCAN_EVENT_NETWORK_FOUND,
pstrNetworkInfo,
-
hif_drv->usr_scan_req.u32UserScanPvoid, NULL);
+
hif_drv->usr_scan_req.scan_result(SCAN_EVENT_NETWORK_FOUND, pstrNetworkInfo,
+
hif_drv->usr_scan_req.u32UserScanPvoid, NULL);
}
}
@@ -1498,7 +1498,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
if ((hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) ||
(hif_drv->hif_state == HOST_IF_CONNECTED) ||
- hif_drv->usr_scan_req.pfUserScanResult) {
+ hif_drv->usr_scan_req.scan_result) {
if (!pstrRcvdGnrlAsyncInfo->buffer ||
!hif_drv->usr_conn_req.pfUserConnectResult) {
PRINT_ER("driver is null\n");
@@ -1634,7 +1634,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
memset(&strDisconnectNotifInfo, 0,
sizeof(tstrDisconnectNotifInfo));
- if (hif_drv->usr_scan_req.pfUserScanResult) {
+
[PATCH V2 24/64] staging: wilc1000: rename u16BufferSize of struct ba_session_info
From: Leo Kim
This patch renames u16BufferSize of struct ba_session_info to buf_size
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 8
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 74d4c8f..75ad6d0 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2718,7 +2718,7 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
strHostIfBASessionInfo->bssid[0],
strHostIfBASessionInfo->bssid[1],
strHostIfBASessionInfo->bssid[2],
- strHostIfBASessionInfo->u16BufferSize,
+ strHostIfBASessionInfo->buf_size,
strHostIfBASessionInfo->u16SessionTimeout,
strHostIfBASessionInfo->tid);
@@ -2734,8 +2734,8 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
ptr += ETH_ALEN;
*ptr++ = strHostIfBASessionInfo->tid;
*ptr++ = 1;
- *ptr++ = (strHostIfBASessionInfo->u16BufferSize & 0xFF);
- *ptr++ = ((strHostIfBASessionInfo->u16BufferSize >> 16) & 0xFF);
+ *ptr++ = (strHostIfBASessionInfo->buf_size & 0xFF);
+ *ptr++ = ((strHostIfBASessionInfo->buf_size >> 16) & 0xFF);
*ptr++ = (strHostIfBASessionInfo->u16SessionTimeout & 0xFF);
*ptr++ = ((strHostIfBASessionInfo->u16SessionTimeout >> 16) & 0xFF);
*ptr++ = (AddbaTimeout & 0xFF);
@@ -2759,7 +2759,7 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
ptr += ETH_ALEN;
*ptr++ = strHostIfBASessionInfo->tid;
*ptr++ = 8;
- *ptr++ = (strHostIfBASessionInfo->u16BufferSize & 0xFF);
+ *ptr++ = (strHostIfBASessionInfo->buf_size & 0xFF);
*ptr++ = ((strHostIfBASessionInfo->u16SessionTimeout >> 16) & 0xFF);
*ptr++ = 3;
result = send_config_pkt(SET_CFG, &wid, 1,
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 9110e9e..e020a6d 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -231,7 +231,7 @@ struct get_mac_addr {
struct ba_session_info {
u8 bssid[ETH_ALEN];
u8 tid;
- u16 u16BufferSize;
+ u16 buf_size;
u16 u16SessionTimeout;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 23/64] staging: wilc1000: rename u8Ted of struct ba_session_info
From: Leo Kim
This patch renames u8Ted of struct ba_session_info to tid
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 14 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 872f239..74d4c8f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2720,7 +2720,7 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
strHostIfBASessionInfo->bssid[2],
strHostIfBASessionInfo->u16BufferSize,
strHostIfBASessionInfo->u16SessionTimeout,
- strHostIfBASessionInfo->u8Ted);
+ strHostIfBASessionInfo->tid);
wid.id = (u16)WID_11E_P_ACTION_REQ;
wid.type = WID_STR;
@@ -2732,7 +2732,7 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
*ptr++ = 0x0;
memcpy(ptr, strHostIfBASessionInfo->bssid, ETH_ALEN);
ptr += ETH_ALEN;
- *ptr++ = strHostIfBASessionInfo->u8Ted;
+ *ptr++ = strHostIfBASessionInfo->tid;
*ptr++ = 1;
*ptr++ = (strHostIfBASessionInfo->u16BufferSize & 0xFF);
*ptr++ = ((strHostIfBASessionInfo->u16BufferSize >> 16) & 0xFF);
@@ -2757,7 +2757,7 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
*ptr++ = 0x2;
memcpy(ptr, strHostIfBASessionInfo->bssid, ETH_ALEN);
ptr += ETH_ALEN;
- *ptr++ = strHostIfBASessionInfo->u8Ted;
+ *ptr++ = strHostIfBASessionInfo->tid;
*ptr++ = 8;
*ptr++ = (strHostIfBASessionInfo->u16BufferSize & 0xFF);
*ptr++ = ((strHostIfBASessionInfo->u16SessionTimeout >> 16) & 0xFF);
@@ -2781,7 +2781,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv
*hif_drv,
strHostIfBASessionInfo->bssid[0],
strHostIfBASessionInfo->bssid[1],
strHostIfBASessionInfo->bssid[2],
- strHostIfBASessionInfo->u8Ted);
+ strHostIfBASessionInfo->tid);
wid.id = (u16)WID_DEL_ALL_RX_BA;
wid.type = WID_STR;
@@ -2793,7 +2793,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv
*hif_drv,
*ptr++ = 0x2;
memcpy(ptr, strHostIfBASessionInfo->bssid, ETH_ALEN);
ptr += ETH_ALEN;
- *ptr++ = strHostIfBASessionInfo->u8Ted;
+ *ptr++ = strHostIfBASessionInfo->tid;
*ptr++ = 0;
*ptr++ = 32;
@@ -4915,7 +4915,7 @@ s32 host_int_delBASession(struct host_if_drv *hif_drv,
char *pBSSID, char TID)
msg.id = HOST_IF_MSG_DEL_BA_SESSION;
memcpy(pBASessionInfo->bssid, pBSSID, ETH_ALEN);
- pBASessionInfo->u8Ted = TID;
+ pBASessionInfo->tid = TID;
msg.drv = hif_drv;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
@@ -4945,7 +4945,7 @@ s32 host_int_del_All_Rx_BASession(struct host_if_drv
*hif_drv,
msg.id = HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS;
memcpy(pBASessionInfo->bssid, pBSSID, ETH_ALEN);
- pBASessionInfo->u8Ted = TID;
+ pBASessionInfo->tid = TID;
msg.drv = hif_drv;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 29cab4e..9110e9e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -230,7 +230,7 @@ struct get_mac_addr {
struct ba_session_info {
u8 bssid[ETH_ALEN];
- u8 u8Ted;
+ u8 tid;
u16 u16BufferSize;
u16 u16SessionTimeout;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 22/64] staging: wilc1000: rename au8Bssid of struct ba_session_info
From: Leo Kim
This patch renames au8Bssid of struct ba_session_info to bssid
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 22 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 1ccf450..872f239 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2715,9 +2715,9 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
char *ptr = NULL;
PRINT_D(HOSTINF_DBG, "Opening Block Ack session with\nBSSID =
%.2x:%.2x:%.2x\nTID=%d\nBufferSize == %d\nSessionTimeOut = %d\n",
- strHostIfBASessionInfo->au8Bssid[0],
- strHostIfBASessionInfo->au8Bssid[1],
- strHostIfBASessionInfo->au8Bssid[2],
+ strHostIfBASessionInfo->bssid[0],
+ strHostIfBASessionInfo->bssid[1],
+ strHostIfBASessionInfo->bssid[2],
strHostIfBASessionInfo->u16BufferSize,
strHostIfBASessionInfo->u16SessionTimeout,
strHostIfBASessionInfo->u8Ted);
@@ -2730,7 +2730,7 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
*ptr++ = 0x14;
*ptr++ = 0x3;
*ptr++ = 0x0;
- memcpy(ptr, strHostIfBASessionInfo->au8Bssid, ETH_ALEN);
+ memcpy(ptr, strHostIfBASessionInfo->bssid, ETH_ALEN);
ptr += ETH_ALEN;
*ptr++ = strHostIfBASessionInfo->u8Ted;
*ptr++ = 1;
@@ -2755,7 +2755,7 @@ static s32 Handle_AddBASession(struct host_if_drv
*hif_drv,
*ptr++ = 15;
*ptr++ = 7;
*ptr++ = 0x2;
- memcpy(ptr, strHostIfBASessionInfo->au8Bssid, ETH_ALEN);
+ memcpy(ptr, strHostIfBASessionInfo->bssid, ETH_ALEN);
ptr += ETH_ALEN;
*ptr++ = strHostIfBASessionInfo->u8Ted;
*ptr++ = 8;
@@ -2778,9 +2778,9 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv
*hif_drv,
char *ptr = NULL;
PRINT_D(GENERIC_DBG, "Delete Block Ack session with\nBSSID =
%.2x:%.2x:%.2x\nTID=%d\n",
- strHostIfBASessionInfo->au8Bssid[0],
- strHostIfBASessionInfo->au8Bssid[1],
- strHostIfBASessionInfo->au8Bssid[2],
+ strHostIfBASessionInfo->bssid[0],
+ strHostIfBASessionInfo->bssid[1],
+ strHostIfBASessionInfo->bssid[2],
strHostIfBASessionInfo->u8Ted);
wid.id = (u16)WID_DEL_ALL_RX_BA;
@@ -2791,7 +2791,7 @@ static s32 Handle_DelAllRxBASessions(struct host_if_drv
*hif_drv,
*ptr++ = 0x14;
*ptr++ = 0x3;
*ptr++ = 0x2;
- memcpy(ptr, strHostIfBASessionInfo->au8Bssid, ETH_ALEN);
+ memcpy(ptr, strHostIfBASessionInfo->bssid, ETH_ALEN);
ptr += ETH_ALEN;
*ptr++ = strHostIfBASessionInfo->u8Ted;
*ptr++ = 0;
@@ -4914,7 +4914,7 @@ s32 host_int_delBASession(struct host_if_drv *hif_drv,
char *pBSSID, char TID)
msg.id = HOST_IF_MSG_DEL_BA_SESSION;
- memcpy(pBASessionInfo->au8Bssid, pBSSID, ETH_ALEN);
+ memcpy(pBASessionInfo->bssid, pBSSID, ETH_ALEN);
pBASessionInfo->u8Ted = TID;
msg.drv = hif_drv;
@@ -4944,7 +4944,7 @@ s32 host_int_del_All_Rx_BASession(struct host_if_drv
*hif_drv,
msg.id = HOST_IF_MSG_DEL_ALL_RX_BA_SESSIONS;
- memcpy(pBASessionInfo->au8Bssid, pBSSID, ETH_ALEN);
+ memcpy(pBASessionInfo->bssid, pBSSID, ETH_ALEN);
pBASessionInfo->u8Ted = TID;
msg.drv = hif_drv;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index a69be55..29cab4e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -229,7 +229,7 @@ struct get_mac_addr {
};
struct ba_session_info {
- u8 au8Bssid[ETH_ALEN];
+ u8 bssid[ETH_ALEN];
u8 u8Ted;
u16 u16BufferSize;
u16 u16SessionTimeout;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 15/64] staging: wilc1000: rename bReg of struct reg_frame
From: Leo Kim
This patch renames bReg of struct reg_frame to reg
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 8 +---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 3cff865..41f226f 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2552,7 +2552,9 @@ static int Handle_RegisterFrame(struct host_if_drv
*hif_drv,
struct wid wid;
u8 *pu8CurrByte;
- PRINT_D(HOSTINF_DBG, "Handling frame register Flag : %d FrameType:
%d\n", pstrHostIfRegisterFrame->bReg, pstrHostIfRegisterFrame->u16FrameType);
+ PRINT_D(HOSTINF_DBG, "Handling frame register : %d FrameType: %d\n",
+ pstrHostIfRegisterFrame->reg,
+ pstrHostIfRegisterFrame->u16FrameType);
wid.id = (u16)WID_REGISTER_FRAME;
wid.type = WID_STR;
@@ -2562,7 +2564,7 @@ static int Handle_RegisterFrame(struct host_if_drv
*hif_drv,
pu8CurrByte = wid.val;
- *pu8CurrByte++ = pstrHostIfRegisterFrame->bReg;
+ *pu8CurrByte++ = pstrHostIfRegisterFrame->reg;
*pu8CurrByte++ = pstrHostIfRegisterFrame->u8Regid;
memcpy(pu8CurrByte, &pstrHostIfRegisterFrame->u16FrameType,
sizeof(u16));
@@ -4434,7 +4436,7 @@ s32 host_int_frame_register(struct host_if_drv *hif_drv,
u16 u16FrameType, bool
break;
}
msg.body.reg_frame.u16FrameType = u16FrameType;
- msg.body.reg_frame.bReg = bReg;
+ msg.body.reg_frame.reg = bReg;
msg.drv = hif_drv;
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 37e5c74..ad3071a 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -245,7 +245,7 @@ struct remain_ch {
};
struct reg_frame {
- bool bReg;
+ bool reg;
u16 u16FrameType;
u8 u8Regid;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 20/64] staging: wilc1000: rename pRemainOnChanReady of struct remain_ch
From: Leo Kim
This patch renames pRemainOnChanReady of struct remain_ch to ready
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 8
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index e0ba720..c49bbbf 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2482,7 +2482,7 @@ static int Handle_RemainOnChan(struct host_if_drv
*hif_drv,
if (!hif_drv->remain_on_ch_pending) {
hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid;
hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired;
- hif_drv->remain_on_ch.pRemainOnChanReady =
pstrHostIfRemainOnChan->pRemainOnChanReady;
+ hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready;
hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
hif_drv->remain_on_ch.u32ListenSessionID =
pstrHostIfRemainOnChan->u32ListenSessionID;
} else {
@@ -2536,8 +2536,8 @@ ERRORHANDLER:
jiffies +
msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration));
- if (hif_drv->remain_on_ch.pRemainOnChanReady)
-
hif_drv->remain_on_ch.pRemainOnChanReady(hif_drv->remain_on_ch.pVoid);
+ if (hif_drv->remain_on_ch.ready)
+
hif_drv->remain_on_ch.ready(hif_drv->remain_on_ch.pVoid);
if (hif_drv->remain_on_ch_pending)
hif_drv->remain_on_ch_pending = 0;
@@ -4370,7 +4370,7 @@ s32 host_int_remain_on_channel(struct host_if_drv
*hif_drv, u32 u32SessionID,
msg.id = HOST_IF_MSG_REMAIN_ON_CHAN;
msg.body.remain_on_ch.ch = chan;
msg.body.remain_on_ch.expired = RemainOnChanExpired;
- msg.body.remain_on_ch.pRemainOnChanReady = RemainOnChanReady;
+ msg.body.remain_on_ch.ready = RemainOnChanReady;
msg.body.remain_on_ch.pVoid = pvUserArg;
msg.body.remain_on_ch.u32duration = u32duration;
msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 3a9f08c..d3dafc6 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -239,7 +239,7 @@ struct remain_ch {
u16 ch;
u32 u32duration;
wilc_remain_on_chan_expired expired;
- wilc_remain_on_chan_ready pRemainOnChanReady;
+ wilc_remain_on_chan_ready ready;
void *pVoid;
u32 u32ListenSessionID;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 14/64] staging: wilc1000: host_interface.h : remove over-commenting
From: Leo Kim
There are over-commenting in the host_interface.h file and most of them
are not helpful to explain what the code does and generate 80 ending
line over warnings. So, all of comments are removed in this patch and the
comments will later be added if necessary with the preferred Linux style.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.h | 740 +-
1 file changed, 4 insertions(+), 736 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 71788b1..37e5c74 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -1,12 +1,3 @@
-/*!
- * @file host_interface.h
- * @brief File containg host interface APIs
- * @authorzsalah
- * @sahost_interface.c
- * @date 8 March 2012
- * @version 1.0
- */
-
#ifndef HOST_INT_H
#define HOST_INT_H
@@ -173,31 +164,18 @@ enum KEY_TYPE {
PMKSA,
};
-
-/*Scan callBack function definition*/
typedef void (*wilc_scan_result)(enum scan_event, tstrNetworkInfo *,
void *, void *);
-/*Connect callBack function definition*/
typedef void (*wilc_connect_result)(enum conn_event,
tstrConnectInfo *,
u8,
tstrDisconnectNotifInfo *,
void *);
-typedef void (*wilc_remain_on_chan_expired)(void *, u32); /*Remain on channel
expiration callback function*/
-typedef void (*wilc_remain_on_chan_ready)(void *); /*Remain on channel
callback function*/
+typedef void (*wilc_remain_on_chan_expired)(void *, u32);
+typedef void (*wilc_remain_on_chan_ready)(void *);
-/*!
- * @struct rcvd_net_info
- * @brief Structure to hold Received Asynchronous Network info
- * @details
- * @todo
- * @sa
- * @authorMostafa Abu Bakr
- * @date 25 March 2012
- * @version 1.0
- */
struct rcvd_net_info {
u8 *buffer;
u32 len;
@@ -214,10 +192,7 @@ struct hidden_network {
};
struct user_scan_req {
- /* Scan user call back function */
wilc_scan_result pfUserScanResult;
-
- /* User specific parameter to be delivered through the Scan User
Callback function */
void *u32UserScanPvoid;
u32 u32RcvdChCount;
@@ -232,10 +207,8 @@ struct user_conn_req {
size_t ssidLen;
u8 *pu8ConnReqIEs;
size_t ConnReqIEsLen;
- /* Connect user call back function */
wilc_connect_result pfUserConnectResult;
bool IsHTCapable;
- /* User specific parameter to be delivered through the Connect User
Callback function */
void *u32UserConnectPvoid;
};
@@ -331,335 +304,37 @@ struct add_sta_param {
u16 u16HTExtParams;
u32 u32TxBeamformingCap;
u8 u8ASELCap;
- u16 u16FlagsMask; /**/
- u16 u16FlagsSet;/*http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 19/64] staging: wilc1000: rename pRemainOnChanExpired of struct remain_ch
From: Leo Kim
This patch renames pRemainOnChanExpired of struct remain_ch to expired
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 10 +-
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 99958f4..e0ba720 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2481,7 +2481,7 @@ static int Handle_RemainOnChan(struct host_if_drv
*hif_drv,
if (!hif_drv->remain_on_ch_pending) {
hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid;
- hif_drv->remain_on_ch.pRemainOnChanExpired =
pstrHostIfRemainOnChan->pRemainOnChanExpired;
+ hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired;
hif_drv->remain_on_ch.pRemainOnChanReady =
pstrHostIfRemainOnChan->pRemainOnChanReady;
hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
hif_drv->remain_on_ch.u32ListenSessionID =
pstrHostIfRemainOnChan->u32ListenSessionID;
@@ -2610,9 +2610,9 @@ static u32 Handle_ListenStateExpired(struct host_if_drv
*hif_drv,
goto _done_;
}
- if (hif_drv->remain_on_ch.pRemainOnChanExpired) {
-
hif_drv->remain_on_ch.pRemainOnChanExpired(hif_drv->remain_on_ch.pVoid,
-
pstrHostIfRemainOnChan->u32ListenSessionID);
+ if (hif_drv->remain_on_ch.expired) {
+
hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.pVoid,
+
pstrHostIfRemainOnChan->u32ListenSessionID);
}
P2P_LISTEN_STATE = 0;
} else {
@@ -4369,7 +4369,7 @@ s32 host_int_remain_on_channel(struct host_if_drv
*hif_drv, u32 u32SessionID,
msg.id = HOST_IF_MSG_REMAIN_ON_CHAN;
msg.body.remain_on_ch.ch = chan;
- msg.body.remain_on_ch.pRemainOnChanExpired = RemainOnChanExpired;
+ msg.body.remain_on_ch.expired = RemainOnChanExpired;
msg.body.remain_on_ch.pRemainOnChanReady = RemainOnChanReady;
msg.body.remain_on_ch.pVoid = pvUserArg;
msg.body.remain_on_ch.u32duration = u32duration;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index dc68711..3a9f08c 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -238,7 +238,7 @@ struct ba_session_info {
struct remain_ch {
u16 ch;
u32 u32duration;
- wilc_remain_on_chan_expired pRemainOnChanExpired;
+ wilc_remain_on_chan_expired expired;
wilc_remain_on_chan_ready pRemainOnChanReady;
void *pVoid;
u32 u32ListenSessionID;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 21/64] staging: wilc1000: rename pVoid of struct remain_ch
From: Leo Kim
This patch renames pVoid of struct remain_ch to arg
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 8
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index c49bbbf..1ccf450 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2480,7 +2480,7 @@ static int Handle_RemainOnChan(struct host_if_drv
*hif_drv,
struct wid wid;
if (!hif_drv->remain_on_ch_pending) {
- hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid;
+ hif_drv->remain_on_ch.arg = pstrHostIfRemainOnChan->arg;
hif_drv->remain_on_ch.expired = pstrHostIfRemainOnChan->expired;
hif_drv->remain_on_ch.ready = pstrHostIfRemainOnChan->ready;
hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
@@ -2537,7 +2537,7 @@ ERRORHANDLER:
msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration));
if (hif_drv->remain_on_ch.ready)
-
hif_drv->remain_on_ch.ready(hif_drv->remain_on_ch.pVoid);
+ hif_drv->remain_on_ch.ready(hif_drv->remain_on_ch.arg);
if (hif_drv->remain_on_ch_pending)
hif_drv->remain_on_ch_pending = 0;
@@ -2611,7 +2611,7 @@ static u32 Handle_ListenStateExpired(struct host_if_drv
*hif_drv,
}
if (hif_drv->remain_on_ch.expired) {
-
hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.pVoid,
+ hif_drv->remain_on_ch.expired(hif_drv->remain_on_ch.arg,
pstrHostIfRemainOnChan->u32ListenSessionID);
}
P2P_LISTEN_STATE = 0;
@@ -4371,7 +4371,7 @@ s32 host_int_remain_on_channel(struct host_if_drv
*hif_drv, u32 u32SessionID,
msg.body.remain_on_ch.ch = chan;
msg.body.remain_on_ch.expired = RemainOnChanExpired;
msg.body.remain_on_ch.ready = RemainOnChanReady;
- msg.body.remain_on_ch.pVoid = pvUserArg;
+ msg.body.remain_on_ch.arg = pvUserArg;
msg.body.remain_on_ch.u32duration = u32duration;
msg.body.remain_on_ch.u32ListenSessionID = u32SessionID;
msg.drv = hif_drv;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index d3dafc6..a69be55 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -240,7 +240,7 @@ struct remain_ch {
u32 u32duration;
wilc_remain_on_chan_expired expired;
wilc_remain_on_chan_ready ready;
- void *pVoid;
+ void *arg;
u32 u32ListenSessionID;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 13/64] staging: wilc1000: rename hRemainOnChannel of struct host_if_drv
From: Leo Kim
This patch renames hRemainOnChannel of struct host_if_drv to remain_on_ch_timer
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 12 ++--
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 6cde0bf..3cff865 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2530,8 +2530,8 @@ static int Handle_RemainOnChan(struct host_if_drv
*hif_drv,
ERRORHANDLER:
{
P2P_LISTEN_STATE = 1;
- hif_drv->hRemainOnChannel.data = (unsigned long)hif_drv;
- mod_timer(&hif_drv->hRemainOnChannel,
+ hif_drv->remain_on_ch_timer.data = (unsigned long)hif_drv;
+ mod_timer(&hif_drv->remain_on_ch_timer,
jiffies +
msecs_to_jiffies(pstrHostIfRemainOnChan->u32duration));
@@ -2628,7 +2628,7 @@ static void ListenTimerCB(unsigned long arg)
struct host_if_msg msg;
struct host_if_drv *hif_drv = (struct host_if_drv *)arg;
- del_timer(&hif_drv->hRemainOnChannel);
+ del_timer(&hif_drv->remain_on_ch_timer);
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
@@ -4139,7 +4139,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
setup_timer(&hif_drv->scan_timer, TimerCB_Scan, 0);
setup_timer(&hif_drv->connect_timer, TimerCB_Connect, 0);
- setup_timer(&hif_drv->hRemainOnChannel, ListenTimerCB, 0);
+ setup_timer(&hif_drv->remain_on_ch_timer, ListenTimerCB, 0);
sema_init(&hif_drv->sem_cfg_values, 1);
down(&hif_drv->sem_cfg_values);
@@ -4202,7 +4202,7 @@ s32 host_int_deinit(struct host_if_drv *hif_drv)
if (del_timer_sync(&periodic_rssi))
PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
- del_timer_sync(&hif_drv->hRemainOnChannel);
+ del_timer_sync(&hif_drv->remain_on_ch_timer);
host_int_set_wfi_drv_handler(NULL);
down(&hif_sema_driver);
@@ -4391,7 +4391,7 @@ s32 host_int_ListenStateExpired(struct host_if_drv
*hif_drv, u32 u32SessionID)
return -EFAULT;
}
- del_timer(&hif_drv->hRemainOnChannel);
+ del_timer(&hif_drv->remain_on_ch_timer);
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_LISTEN_TIMER_FIRED;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index d95011e..71788b1 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -314,7 +314,7 @@ struct host_if_drv {
struct timer_list scan_timer;
struct timer_list connect_timer;
- struct timer_list hRemainOnChannel;
+ struct timer_list remain_on_ch_timer;
bool IFC_UP;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 18/64] staging: wilc1000: rename u16Channel of struct remain_ch
From: Leo Kim
This patch renames u16Channel of struct remain_ch to ch
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 11 ++-
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 12e0d21..99958f4 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2483,10 +2483,10 @@ static int Handle_RemainOnChan(struct host_if_drv
*hif_drv,
hif_drv->remain_on_ch.pVoid = pstrHostIfRemainOnChan->pVoid;
hif_drv->remain_on_ch.pRemainOnChanExpired =
pstrHostIfRemainOnChan->pRemainOnChanExpired;
hif_drv->remain_on_ch.pRemainOnChanReady =
pstrHostIfRemainOnChan->pRemainOnChanReady;
- hif_drv->remain_on_ch.u16Channel =
pstrHostIfRemainOnChan->u16Channel;
+ hif_drv->remain_on_ch.ch = pstrHostIfRemainOnChan->ch;
hif_drv->remain_on_ch.u32ListenSessionID =
pstrHostIfRemainOnChan->u32ListenSessionID;
} else {
- pstrHostIfRemainOnChan->u16Channel =
hif_drv->remain_on_ch.u16Channel;
+ pstrHostIfRemainOnChan->ch = hif_drv->remain_on_ch.ch;
}
if (hif_drv->usr_scan_req.pfUserScanResult) {
@@ -2507,7 +2507,8 @@ static int Handle_RemainOnChan(struct host_if_drv
*hif_drv,
goto ERRORHANDLER;
}
- PRINT_D(HOSTINF_DBG, "Setting channel :%d\n",
pstrHostIfRemainOnChan->u16Channel);
+ PRINT_D(HOSTINF_DBG, "Setting channel :%d\n",
+ pstrHostIfRemainOnChan->ch);
u8remain_on_chan_flag = true;
wid.id = (u16)WID_REMAIN_ON_CHAN;
@@ -2520,7 +2521,7 @@ static int Handle_RemainOnChan(struct host_if_drv
*hif_drv,
}
wid.val[0] = u8remain_on_chan_flag;
- wid.val[1] = (s8)pstrHostIfRemainOnChan->u16Channel;
+ wid.val[1] = (s8)pstrHostIfRemainOnChan->ch;
result = send_config_pkt(SET_CFG, &wid, 1,
get_id_from_handler(hif_drv));
@@ -4367,7 +4368,7 @@ s32 host_int_remain_on_channel(struct host_if_drv
*hif_drv, u32 u32SessionID,
memset(&msg, 0, sizeof(struct host_if_msg));
msg.id = HOST_IF_MSG_REMAIN_ON_CHAN;
- msg.body.remain_on_ch.u16Channel = chan;
+ msg.body.remain_on_ch.ch = chan;
msg.body.remain_on_ch.pRemainOnChanExpired = RemainOnChanExpired;
msg.body.remain_on_ch.pRemainOnChanReady = RemainOnChanReady;
msg.body.remain_on_ch.pVoid = pvUserArg;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 6cca6e0..dc68711 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -236,7 +236,7 @@ struct ba_session_info {
};
struct remain_ch {
- u16 u16Channel;
+ u16 ch;
u32 u32duration;
wilc_remain_on_chan_expired pRemainOnChanExpired;
wilc_remain_on_chan_ready pRemainOnChanReady;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 12/64] staging: wilc1000: rename hConnectTimer of struct host_if_drv
From: Leo Kim
This patch renames hConnectTimer of struct host_if_drv to connect_timer
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 17 -
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 8b13e67..6cde0bf 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1223,7 +1223,7 @@ ERRORHANDLER:
if (result) {
tstrConnectInfo strConnectInfo;
- del_timer(&hif_drv->hConnectTimer);
+ del_timer(&hif_drv->connect_timer);
PRINT_D(HOSTINF_DBG, "could not start connecting to the
required network\n");
@@ -1594,7 +1594,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
hif_drv->usr_conn_req.ConnReqIEsLen);
}
- del_timer(&hif_drv->hConnectTimer);
+ del_timer(&hif_drv->connect_timer);
hif_drv->usr_conn_req.pfUserConnectResult(CONN_DISCONN_EVENT_CONN_RESP,
&strConnectInfo,
u8MacStatus,
@@ -2009,7 +2009,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
if (hif_drv->usr_conn_req.pfUserConnectResult) {
if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) {
PRINT_D(HOSTINF_DBG, "Upper layer requested
termination of connection\n");
- del_timer(&hif_drv->hConnectTimer);
+ del_timer(&hif_drv->connect_timer);
}
hif_drv->usr_conn_req.pfUserConnectResult(CONN_DISCONN_EVENT_DISCONN_NOTIF,
NULL,
@@ -3512,8 +3512,8 @@ s32 host_int_set_join_req(struct host_if_drv *hif_drv, u8
*pu8bssid,
return -EFAULT;
}
- hif_drv->hConnectTimer.data = (unsigned long)hif_drv;
- mod_timer(&hif_drv->hConnectTimer,
+ hif_drv->connect_timer.data = (unsigned long)hif_drv;
+ mod_timer(&hif_drv->connect_timer,
jiffies + msecs_to_jiffies(HOST_IF_CONNECT_TIMEOUT));
return result;
@@ -4138,8 +4138,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
}
setup_timer(&hif_drv->scan_timer, TimerCB_Scan, 0);
- setup_timer(&hif_drv->hConnectTimer, TimerCB_Connect, 0);
-
+ setup_timer(&hif_drv->connect_timer, TimerCB_Connect, 0);
setup_timer(&hif_drv->hRemainOnChannel, ListenTimerCB, 0);
sema_init(&hif_drv->sem_cfg_values, 1);
@@ -4169,7 +4168,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
_fail_timer_2:
up(&hif_drv->sem_cfg_values);
- del_timer_sync(&hif_drv->hConnectTimer);
+ del_timer_sync(&hif_drv->connect_timer);
del_timer_sync(&hif_drv->scan_timer);
kthread_stop(hif_thread_handler);
_fail_mq_:
@@ -4197,7 +4196,7 @@ s32 host_int_deinit(struct host_if_drv *hif_drv)
if (del_timer_sync(&hif_drv->scan_timer))
PRINT_D(HOSTINF_DBG, ">> Scan timer is active\n");
- if (del_timer_sync(&hif_drv->hConnectTimer))
+ if (del_timer_sync(&hif_drv->connect_timer))
PRINT_D(HOSTINF_DBG, ">> Connect timer is active\n");
if (del_timer_sync(&periodic_rssi))
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 55afcae..d95011e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -313,7 +313,7 @@ struct host_if_drv {
struct semaphore sem_inactive_time;
struct timer_list scan_timer;
- struct timer_list hConnectTimer;
+ struct timer_list connect_timer;
struct timer_list hRemainOnChannel;
bool IFC_UP;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 16/64] staging: wilc1000: rename u16FrameType of struct reg_frame
From: Leo Kim
This patch renames u16FrameType of struct reg_frame to frame_type
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 7 +++
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 41f226f..3c17912 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2554,7 +2554,7 @@ static int Handle_RegisterFrame(struct host_if_drv
*hif_drv,
PRINT_D(HOSTINF_DBG, "Handling frame register : %d FrameType: %d\n",
pstrHostIfRegisterFrame->reg,
- pstrHostIfRegisterFrame->u16FrameType);
+ pstrHostIfRegisterFrame->frame_type);
wid.id = (u16)WID_REGISTER_FRAME;
wid.type = WID_STR;
@@ -2566,8 +2566,7 @@ static int Handle_RegisterFrame(struct host_if_drv
*hif_drv,
*pu8CurrByte++ = pstrHostIfRegisterFrame->reg;
*pu8CurrByte++ = pstrHostIfRegisterFrame->u8Regid;
- memcpy(pu8CurrByte, &pstrHostIfRegisterFrame->u16FrameType,
- sizeof(u16));
+ memcpy(pu8CurrByte, &pstrHostIfRegisterFrame->frame_type, sizeof(u16));
wid.size = sizeof(u16) + 2;
@@ -4435,7 +4434,7 @@ s32 host_int_frame_register(struct host_if_drv *hif_drv,
u16 u16FrameType, bool
PRINT_D(HOSTINF_DBG, "Not valid frame type\n");
break;
}
- msg.body.reg_frame.u16FrameType = u16FrameType;
+ msg.body.reg_frame.frame_type = u16FrameType;
msg.body.reg_frame.reg = bReg;
msg.drv = hif_drv;
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index ad3071a..f4239a7 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -246,7 +246,7 @@ struct remain_ch {
struct reg_frame {
bool reg;
- u16 u16FrameType;
+ u16 frame_type;
u8 u8Regid;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 17/64] staging: wilc1000: rename u8Regid of struct reg_frame
From: Leo Kim
This patch renames u8Regid of struct reg_frame to reg_id
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 3c17912..12e0d21 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2565,7 +2565,7 @@ static int Handle_RegisterFrame(struct host_if_drv
*hif_drv,
pu8CurrByte = wid.val;
*pu8CurrByte++ = pstrHostIfRegisterFrame->reg;
- *pu8CurrByte++ = pstrHostIfRegisterFrame->u8Regid;
+ *pu8CurrByte++ = pstrHostIfRegisterFrame->reg_id;
memcpy(pu8CurrByte, &pstrHostIfRegisterFrame->frame_type, sizeof(u16));
wid.size = sizeof(u16) + 2;
@@ -4422,12 +4422,12 @@ s32 host_int_frame_register(struct host_if_drv
*hif_drv, u16 u16FrameType, bool
switch (u16FrameType) {
case ACTION:
PRINT_D(HOSTINF_DBG, "ACTION\n");
- msg.body.reg_frame.u8Regid = ACTION_FRM_IDX;
+ msg.body.reg_frame.reg_id = ACTION_FRM_IDX;
break;
case PROBE_REQ:
PRINT_D(HOSTINF_DBG, "PROBE REQ\n");
- msg.body.reg_frame.u8Regid = PROBE_REQ_IDX;
+ msg.body.reg_frame.reg_id = PROBE_REQ_IDX;
break;
default:
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index f4239a7..6cca6e0 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -247,7 +247,7 @@ struct remain_ch {
struct reg_frame {
bool reg;
u16 frame_type;
- u8 u8Regid;
+ u8 reg_id;
};
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 09/64] staging: wilc1000: rename hSemGetCHNL of struct host_if_drv
From: Leo Kim
This patch renames hSemGetCHNL of struct host_if_drv to sem_get_chnl
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 7b654c5..b59551a 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2075,7 +2075,7 @@ static s32 Handle_GetChnl(struct host_if_drv *hif_drv)
result = -EFAULT;
}
- up(&hif_drv->hSemGetCHNL);
+ up(&hif_drv->sem_get_chnl);
return result;
}
@@ -3737,7 +3737,7 @@ s32 host_int_get_host_chnl_num(struct host_if_drv
*hif_drv, u8 *pu8ChNo)
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result)
PRINT_ER("wilc mq send fail\n");
- down(&hif_drv->hSemGetCHNL);
+ down(&hif_drv->sem_get_chnl);
*pu8ChNo = ch_no;
@@ -4111,7 +4111,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
sema_init(&hif_drv->sem_test_disconn_block, 0);
sema_init(&hif_drv->sem_get_rssi, 0);
sema_init(&hif_drv->sem_get_link_speed, 0);
- sema_init(&hif_drv->hSemGetCHNL, 0);
+ sema_init(&hif_drv->sem_get_chnl, 0);
sema_init(&hif_drv->hSemInactiveTime, 0);
PRINT_D(HOSTINF_DBG, "INIT: CLIENT COUNT %d\n", clients_count);
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index a603e84..8d12099 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -309,7 +309,7 @@ struct host_if_drv {
struct semaphore sem_test_disconn_block;
struct semaphore sem_get_rssi;
struct semaphore sem_get_link_speed;
- struct semaphore hSemGetCHNL;
+ struct semaphore sem_get_chnl;
struct semaphore hSemInactiveTime;
/* timer handlers */
struct timer_list hScanTimer;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 11/64] staging: wilc1000: rename hScanTimer of struct host_if_drv
From: Leo Kim
This patch renames hScanTimer of struct host_if_drv to scan_timer
to avoid CamelCase naming convention.
And, remove the relation comment.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 21 ++---
drivers/staging/wilc1000/host_interface.h | 4 ++--
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index f95d662..8b13e67 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -921,7 +921,7 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
ERRORHANDLER:
if (result) {
- del_timer(&hif_drv->hScanTimer);
+ del_timer(&hif_drv->scan_timer);
Handle_ScanDone(hif_drv, SCAN_EVENT_ABORTED);
}
@@ -1636,7 +1636,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
if (hif_drv->usr_scan_req.pfUserScanResult) {
PRINT_D(HOSTINF_DBG, "\n\n<< Abort the running
OBSS Scan >>\n\n");
- del_timer(&hif_drv->hScanTimer);
+ del_timer(&hif_drv->scan_timer);
Handle_ScanDone((void *)hif_drv,
SCAN_EVENT_ABORTED);
}
@@ -1683,7 +1683,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
PRINT_D(HOSTINF_DBG, "Received MAC_DISCONNECTED from
the FW while scanning\n");
PRINT_D(HOSTINF_DBG, "\n\n<< Abort the running Scan
>>\n\n");
- del_timer(&hif_drv->hScanTimer);
+ del_timer(&hif_drv->scan_timer);
if (hif_drv->usr_scan_req.pfUserScanResult)
Handle_ScanDone(hif_drv, SCAN_EVENT_ABORTED);
}
@@ -1999,7 +1999,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
strDisconnectNotifInfo.ie_len = 0;
if (hif_drv->usr_scan_req.pfUserScanResult) {
- del_timer(&hif_drv->hScanTimer);
+ del_timer(&hif_drv->scan_timer);
hif_drv->usr_scan_req.pfUserScanResult(SCAN_EVENT_ABORTED, NULL,
hif_drv->usr_scan_req.u32UserScanPvoid, NULL);
@@ -2881,7 +2881,7 @@ static int hostIFthread(void *pvArg)
break;
case HOST_IF_MSG_RCVD_SCAN_COMPLETE:
- del_timer(&hif_drv->hScanTimer);
+ del_timer(&hif_drv->scan_timer);
PRINT_D(HOSTINF_DBG, "scan completed successfully\n");
if (!linux_wlan_get_num_conn_ifcs())
@@ -3920,8 +3920,8 @@ s32 host_int_scan(struct host_if_drv *hif_drv, u8
u8ScanSource,
}
PRINT_D(HOSTINF_DBG, ">> Starting the SCAN timer\n");
- hif_drv->hScanTimer.data = (unsigned long)hif_drv;
- mod_timer(&hif_drv->hScanTimer,
+ hif_drv->scan_timer.data = (unsigned long)hif_drv;
+ mod_timer(&hif_drv->scan_timer,
jiffies + msecs_to_jiffies(HOST_IF_SCAN_TIMEOUT));
return result;
@@ -4137,8 +4137,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
mod_timer(&periodic_rssi, jiffies + msecs_to_jiffies(5000));
}
- setup_timer(&hif_drv->hScanTimer, TimerCB_Scan, 0);
-
+ setup_timer(&hif_drv->scan_timer, TimerCB_Scan, 0);
setup_timer(&hif_drv->hConnectTimer, TimerCB_Connect, 0);
setup_timer(&hif_drv->hRemainOnChannel, ListenTimerCB, 0);
@@ -4171,7 +4170,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
_fail_timer_2:
up(&hif_drv->sem_cfg_values);
del_timer_sync(&hif_drv->hConnectTimer);
- del_timer_sync(&hif_drv->hScanTimer);
+ del_timer_sync(&hif_drv->scan_timer);
kthread_stop(hif_thread_handler);
_fail_mq_:
wilc_mq_destroy(&hif_msg_q);
@@ -4195,7 +4194,7 @@ s32 host_int_deinit(struct host_if_drv *hif_drv)
terminated_handle = hif_drv;
PRINT_D(HOSTINF_DBG, "De-initializing host interface for client %d\n",
clients_count);
- if (del_timer_sync(&hif_drv->hScanTimer))
+ if (del_timer_sync(&hif_drv->scan_timer))
PRINT_D(HOSTINF_DBG, ">> Scan timer is active\n");
if (del_timer_sync(&hif_drv->hConnectTimer))
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index de3baaf..55afcae 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -311,8 +311,8 @@ struct host_if_drv {
struct semaphore sem_get_link_speed;
struct semaphore sem_get_chnl;
struct semaphore sem_inactive_time;
-/* timer han
[PATCH V2 06/64] staging: wilc1000: rename hSemTestDisconnectBlock of struct host_if_drv
From: Leo Kim
This patch renames hSemTestDisconnectBlock of struct host_if_drv to
sem_test_disconn_block to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 99bf633..4daef63 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2041,7 +2041,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
}
}
- up(&hif_drv->hSemTestDisconnectBlock);
+ up(&hif_drv->sem_test_disconn_block);
}
void resolve_disconnect_aberration(struct host_if_drv *hif_drv)
@@ -3563,7 +3563,7 @@ s32 host_int_disconnect(struct host_if_drv *hif_drv, u16
u16ReasonCode)
if (result)
PRINT_ER("Failed to send message queue: disconnect\n");
- down(&hif_drv->hSemTestDisconnectBlock);
+ down(&hif_drv->sem_test_disconn_block);
return result;
}
@@ -4108,7 +4108,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
}
sema_init(&hif_drv->sem_test_key_block, 0);
- sema_init(&hif_drv->hSemTestDisconnectBlock, 0);
+ sema_init(&hif_drv->sem_test_disconn_block, 0);
sema_init(&hif_drv->hSemGetRSSI, 0);
sema_init(&hif_drv->hSemGetLINKSPEED, 0);
sema_init(&hif_drv->hSemGetCHNL, 0);
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index a8fd290..0c7a773 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -306,7 +306,7 @@ struct host_if_drv {
struct semaphore sem_cfg_values;
struct semaphore sem_test_key_block;
- struct semaphore hSemTestDisconnectBlock;
+ struct semaphore sem_test_disconn_block;
struct semaphore hSemGetRSSI;
struct semaphore hSemGetLINKSPEED;
struct semaphore hSemGetCHNL;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 08/64] staging: wilc1000: rename hSemGetLINKSPEED of struct host_if_drv
From: Leo Kim
This patch renames hSemGetLINKSPEED of struct host_if_drv to sem_get_link_speed
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index b40ce3b..7b654c5 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2123,7 +2123,7 @@ static void Handle_GetLinkspeed(struct host_if_drv
*hif_drv)
result = -EFAULT;
}
- up(&hif_drv->hSemGetLINKSPEED);
+ up(&hif_drv->sem_get_link_speed);
}
s32 Handle_GetStatistics(struct host_if_drv *hif_drv, struct rf_info
*pstrStatistics)
@@ -3842,7 +3842,7 @@ s32 host_int_get_link_speed(struct host_if_drv *hif_drv,
s8 *ps8lnkspd)
return -EFAULT;
}
- down(&hif_drv->hSemGetLINKSPEED);
+ down(&hif_drv->sem_get_link_speed);
if (!ps8lnkspd) {
PRINT_ER("LINKSPEED pointer value is null");
@@ -4110,7 +4110,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
sema_init(&hif_drv->sem_test_key_block, 0);
sema_init(&hif_drv->sem_test_disconn_block, 0);
sema_init(&hif_drv->sem_get_rssi, 0);
- sema_init(&hif_drv->hSemGetLINKSPEED, 0);
+ sema_init(&hif_drv->sem_get_link_speed, 0);
sema_init(&hif_drv->hSemGetCHNL, 0);
sema_init(&hif_drv->hSemInactiveTime, 0);
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index dada9c5..a603e84 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -308,7 +308,7 @@ struct host_if_drv {
struct semaphore sem_test_key_block;
struct semaphore sem_test_disconn_block;
struct semaphore sem_get_rssi;
- struct semaphore hSemGetLINKSPEED;
+ struct semaphore sem_get_link_speed;
struct semaphore hSemGetCHNL;
struct semaphore hSemInactiveTime;
/* timer handlers */
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 10/64] staging: wilc1000: rename hSemInactiveTime of struct host_if_drv
From: Leo Kim
This patch renames hSemInactiveTime of struct host_if_drv to sem_inactive_time
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index b59551a..f95d662 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2211,7 +2211,7 @@ static s32 Handle_Get_InActiveTime(struct host_if_drv
*hif_drv,
PRINT_D(CFG80211_DBG, "Getting inactive time : %d\n", inactive_time);
- up(&hif_drv->hSemInactiveTime);
+ up(&hif_drv->sem_inactive_time);
return result;
}
@@ -3765,7 +3765,7 @@ s32 host_int_get_inactive_time(struct host_if_drv
*hif_drv,
if (result)
PRINT_ER("Failed to send get host channel param's message queue
");
- down(&hif_drv->hSemInactiveTime);
+ down(&hif_drv->sem_inactive_time);
*pu32InactiveTime = inactive_time;
@@ -4112,7 +4112,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
sema_init(&hif_drv->sem_get_rssi, 0);
sema_init(&hif_drv->sem_get_link_speed, 0);
sema_init(&hif_drv->sem_get_chnl, 0);
- sema_init(&hif_drv->hSemInactiveTime, 0);
+ sema_init(&hif_drv->sem_inactive_time, 0);
PRINT_D(HOSTINF_DBG, "INIT: CLIENT COUNT %d\n", clients_count);
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 8d12099..de3baaf 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -310,7 +310,7 @@ struct host_if_drv {
struct semaphore sem_get_rssi;
struct semaphore sem_get_link_speed;
struct semaphore sem_get_chnl;
- struct semaphore hSemInactiveTime;
+ struct semaphore sem_inactive_time;
/* timer handlers */
struct timer_list hScanTimer;
struct timer_list hConnectTimer;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 07/64] staging: wilc1000: rename hSemGetRSSI of struct host_if_drv
From: Leo Kim
This patch renames hSemGetRSSI of struct host_if_drv to sem_get_rssi
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 6 +++---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 4daef63..b40ce3b 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -2099,7 +2099,7 @@ static void Handle_GetRssi(struct host_if_drv *hif_drv)
result = -EFAULT;
}
- up(&hif_drv->hSemGetRSSI);
+ up(&hif_drv->sem_get_rssi);
}
static void Handle_GetLinkspeed(struct host_if_drv *hif_drv)
@@ -3815,7 +3815,7 @@ s32 host_int_get_rssi(struct host_if_drv *hif_drv, s8
*ps8Rssi)
return -EFAULT;
}
- down(&hif_drv->hSemGetRSSI);
+ down(&hif_drv->sem_get_rssi);
if (!ps8Rssi) {
PRINT_ER("RSS pointer value is null");
@@ -4109,7 +4109,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
sema_init(&hif_drv->sem_test_key_block, 0);
sema_init(&hif_drv->sem_test_disconn_block, 0);
- sema_init(&hif_drv->hSemGetRSSI, 0);
+ sema_init(&hif_drv->sem_get_rssi, 0);
sema_init(&hif_drv->hSemGetLINKSPEED, 0);
sema_init(&hif_drv->hSemGetCHNL, 0);
sema_init(&hif_drv->hSemInactiveTime, 0);
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 0c7a773..dada9c5 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -307,7 +307,7 @@ struct host_if_drv {
struct semaphore sem_cfg_values;
struct semaphore sem_test_key_block;
struct semaphore sem_test_disconn_block;
- struct semaphore hSemGetRSSI;
+ struct semaphore sem_get_rssi;
struct semaphore hSemGetLINKSPEED;
struct semaphore hSemGetCHNL;
struct semaphore hSemInactiveTime;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 05/64] staging: wilc1000: rename hSemTestKeyBlock of struct host_if_drv
From: Leo Kim
This patch renames hSemTestKeyBlock of struct host_if_drv to sem_test_key_block
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 24
drivers/staging/wilc1000/host_interface.h | 3 +--
2 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index c6a08d2..99bf633 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1792,7 +1792,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
result = send_config_pkt(SET_CFG, &wid, 1,
get_id_from_handler(hif_drv));
}
- up(&hif_drv->hSemTestKeyBlock);
+ up(&hif_drv->sem_test_key_block);
break;
case WPARxGtk:
@@ -1826,7 +1826,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
get_id_from_handler(hif_drv));
kfree(pu8keybuf);
- up(&hif_drv->hSemTestKeyBlock);
+ up(&hif_drv->sem_test_key_block);
}
if (pstrHostIFkeyAttr->action & ADDKEY) {
@@ -1859,7 +1859,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
get_id_from_handler(hif_drv));
kfree(pu8keybuf);
- up(&hif_drv->hSemTestKeyBlock);
+ up(&hif_drv->sem_test_key_block);
}
_WPARxGtk_end_case_:
kfree(pstrHostIFkeyAttr->attr.wpa.key);
@@ -1897,7 +1897,7 @@ _WPARxGtk_end_case_:
result = send_config_pkt(SET_CFG, strWIDList, 2,
get_id_from_handler(hif_drv));
kfree(pu8keybuf);
- up(&hif_drv->hSemTestKeyBlock);
+ up(&hif_drv->sem_test_key_block);
}
if (pstrHostIFkeyAttr->action & ADDKEY) {
pu8keybuf = kmalloc(PTK_KEY_MSG_LEN, GFP_KERNEL);
@@ -1920,7 +1920,7 @@ _WPARxGtk_end_case_:
result = send_config_pkt(SET_CFG, &wid, 1,
get_id_from_handler(hif_drv));
kfree(pu8keybuf);
- up(&hif_drv->hSemTestKeyBlock);
+ up(&hif_drv->sem_test_key_block);
}
_WPAPtk_end_case_:
@@ -3076,7 +3076,7 @@ int host_int_remove_wep_key(struct host_if_drv *hif_drv,
u8 index)
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result)
PRINT_ER("Error in sending message queue : Request to remove
WEP key\n");
- down(&hif_drv->hSemTestKeyBlock);
+ down(&hif_drv->sem_test_key_block);
return result;
}
@@ -3103,7 +3103,7 @@ int host_int_set_wep_default_key(struct host_if_drv
*hif_drv, u8 index)
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result)
PRINT_ER("Error in sending message queue : Default key
index\n");
- down(&hif_drv->hSemTestKeyBlock);
+ down(&hif_drv->sem_test_key_block);
return result;
}
@@ -3137,7 +3137,7 @@ int host_int_add_wep_key_bss_sta(struct host_if_drv
*hif_drv,
result = wilc_mq_send(&hif_msg_q, &msg, sizeof(struct host_if_msg));
if (result)
PRINT_ER("Error in sending message queue :WEP Key\n");
- down(&hif_drv->hSemTestKeyBlock);
+ down(&hif_drv->sem_test_key_block);
return result;
}
@@ -3181,7 +3181,7 @@ int host_int_add_wep_key_bss_ap(struct host_if_drv
*hif_drv,
if (result)
PRINT_ER("Error in sending message queue :WEP Key\n");
- down(&hif_drv->hSemTestKeyBlock);
+ down(&hif_drv->sem_test_key_block);
return result;
}
@@ -3246,7 +3246,7 @@ s32 host_int_add_ptk(struct host_if_drv *hif_drv, const
u8 *pu8Ptk,
if (result)
PRINT_ER("Error in sending message queue: PTK Key\n");
- down(&hif_drv->hSemTestKeyBlock);
+ down(&hif_drv->sem_test_key_block);
return result;
}
@@ -3308,7 +3308,7 @@ s32 host_int_add_rx_gtk(struct host_if_drv *hif_drv,
const u8 *pu8RxGtk,
if (result)
PRINT_ER("Error in sending message queue: RX GTK\n");
- down(&hif_drv->hSemTestKeyBlock);
+ down(&hif_drv->sem_test_key_block);
return result;
}
@@ -4107,7 +4107,7 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
sema_init(&hif_sema_deinit, 1);
}
- sema_init(&hif_drv->hSemTestKeyBlock, 0);
+ sema_init(&hif_drv->sem_test_key_block, 0);
sema_init(&hif_drv->hSemT
[PATCH V2 01/64] staging: wilc1000: rename enuHostIFstate of struct host_if_drv
From: Leo Kim
This patch renames enuHostIFstate of struct host_if_drv to hif_state
to avoid CamelCase naming convention.
And, some comments modification that has been included name 'enuHostIFstate'.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 62 ---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 34 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index dbbe72c..4e01dbd 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -820,13 +820,15 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
u8 *pu8HdnNtwrksWidVal = NULL;
PRINT_D(HOSTINF_DBG, "Setting SCAN params\n");
- PRINT_D(HOSTINF_DBG, "Scanning: In [%d] state\n",
hif_drv->enuHostIFstate);
+ PRINT_D(HOSTINF_DBG, "Scanning: In [%d] state\n", hif_drv->hif_state);
hif_drv->usr_scan_req.pfUserScanResult = pstrHostIFscanAttr->result;
hif_drv->usr_scan_req.u32UserScanPvoid = pstrHostIFscanAttr->arg;
- if ((hif_drv->enuHostIFstate >= HOST_IF_SCANNING) &&
(hif_drv->enuHostIFstate < HOST_IF_CONNECTED)) {
- PRINT_D(GENERIC_DBG, "Don't scan we are already in [%d]
state\n", hif_drv->enuHostIFstate);
+ if ((hif_drv->hif_state >= HOST_IF_SCANNING) &&
+ (hif_drv->hif_state < HOST_IF_CONNECTED)) {
+ PRINT_D(GENERIC_DBG, "Don't scan already in [%d] state\n",
+ hif_drv->hif_state);
PRINT_ER("Already scan\n");
result = -EBUSY;
goto ERRORHANDLER;
@@ -904,9 +906,9 @@ static s32 Handle_Scan(struct host_if_drv *hif_drv,
strWIDList[u32WidsCount].val = (s8 *)&pstrHostIFscanAttr->src;
u32WidsCount++;
- if (hif_drv->enuHostIFstate == HOST_IF_CONNECTED)
+ if (hif_drv->hif_state == HOST_IF_CONNECTED)
scan_while_connected = true;
- else if (hif_drv->enuHostIFstate == HOST_IF_IDLE)
+ else if (hif_drv->hif_state == HOST_IF_IDLE)
scan_while_connected = false;
result = send_config_pkt(SET_CFG, strWIDList, u32WidsCount,
@@ -1214,7 +1216,7 @@ static s32 Handle_Connect(struct host_if_drv *hif_drv,
goto ERRORHANDLER;
} else {
PRINT_D(GENERIC_DBG, "set HOST_IF_WAITING_CONN_RESP\n");
- hif_drv->enuHostIFstate = HOST_IF_WAITING_CONN_RESP;
+ hif_drv->hif_state = HOST_IF_WAITING_CONN_RESP;
}
ERRORHANDLER:
@@ -1244,7 +1246,7 @@ ERRORHANDLER:
MAC_DISCONNECTED,
NULL,
pstrHostIFconnectAttr->arg);
- hif_drv->enuHostIFstate = HOST_IF_IDLE;
+ hif_drv->hif_state = HOST_IF_IDLE;
kfree(strConnectInfo.pu8ReqIEs);
strConnectInfo.pu8ReqIEs = NULL;
@@ -1325,7 +1327,7 @@ static s32 Handle_ConnectTimeout(struct host_if_drv
*hif_drv)
return result;
}
- hif_drv->enuHostIFstate = HOST_IF_IDLE;
+ hif_drv->hif_state = HOST_IF_IDLE;
scan_while_connected = false;
@@ -1491,11 +1493,11 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
PRINT_ER("Driver handler is NULL\n");
return -ENODEV;
}
- PRINT_D(GENERIC_DBG, "Current State = %d,Received state = %d\n",
hif_drv->enuHostIFstate,
- pstrRcvdGnrlAsyncInfo->buffer[7]);
+ PRINT_D(GENERIC_DBG, "Current State = %d,Received state = %d\n",
+ hif_drv->hif_state, pstrRcvdGnrlAsyncInfo->buffer[7]);
- if ((hif_drv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) ||
- (hif_drv->enuHostIFstate == HOST_IF_CONNECTED) ||
+ if ((hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) ||
+ (hif_drv->hif_state == HOST_IF_CONNECTED) ||
hif_drv->usr_scan_req.pfUserScanResult) {
if (!pstrRcvdGnrlAsyncInfo->buffer ||
!hif_drv->usr_conn_req.pfUserConnectResult) {
@@ -1518,7 +1520,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
u8MacStatusReasonCode = pstrRcvdGnrlAsyncInfo->buffer[8];
u8MacStatusAdditionalInfo = pstrRcvdGnrlAsyncInfo->buffer[9];
PRINT_INFO(HOSTINF_DBG, "Recieved MAC status = %d with Reason =
%d , Info = %d\n", u8MacStatus, u8MacStatusReasonCode,
u8MacStatusAdditionalInfo);
- if (hif_drv->enuHostIFstate == HOST_IF_WAITING_CONN_RESP) {
+ if (hif_drv->hif_state == HOST_IF_WAITING_CONN_RESP) {
u32 u32RcvdAssocRespInfoLen;
tstrConnectRespInfo *pstrConnectRespInfo = NULL;
[PATCH V2 04/64] staging: wilc1000: rename gtOsCfgValuesSem of struct host_if_drv
From: Leo Kim
This patch renames gtOsCfgValuesSem of struct host_if_drv to sem_cfg_values
to avoid CamelCase naming convention.
And, remove the relation comment.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 18 +-
drivers/staging/wilc1000/host_interface.h | 4 ++--
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 135d4b3..c6a08d2 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -525,7 +525,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
struct wid strWIDList[32];
u8 u8WidCnt = 0;
- down(&hif_drv->gtOsCfgValuesSem);
+ down(&hif_drv->sem_cfg_values);
PRINT_D(HOSTINF_DBG, "Setting CFG params\n");
@@ -797,7 +797,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
PRINT_ER("Error in setting CFG params\n");
ERRORHANDLER:
- up(&hif_drv->gtOsCfgValuesSem);
+ up(&hif_drv->sem_cfg_values);
return result;
}
@@ -3952,7 +3952,7 @@ s32 hif_get_cfg(struct host_if_drv *hif_drv, u16 u16WID,
u16 *pu16WID_Value)
{
s32 result = 0;
- down(&hif_drv->gtOsCfgValuesSem);
+ down(&hif_drv->sem_cfg_values);
if (!hif_drv) {
PRINT_ER("hif_drv NULL\n");
@@ -4036,7 +4036,7 @@ s32 hif_get_cfg(struct host_if_drv *hif_drv, u16 u16WID,
u16 *pu16WID_Value)
break;
}
- up(&hif_drv->gtOsCfgValuesSem);
+ up(&hif_drv->sem_cfg_values);
return result;
}
@@ -4143,8 +4143,8 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
setup_timer(&hif_drv->hRemainOnChannel, ListenTimerCB, 0);
- sema_init(&hif_drv->gtOsCfgValuesSem, 1);
- down(&hif_drv->gtOsCfgValuesSem);
+ sema_init(&hif_drv->sem_cfg_values, 1);
+ down(&hif_drv->sem_cfg_values);
hif_drv->hif_state = HOST_IF_IDLE;
hif_drv->cfg_values.site_survey_enabled = SITE_SURVEY_OFF;
@@ -4162,14 +4162,14 @@ s32 host_int_init(struct net_device *dev, struct
host_if_drv **hif_drv_handler)
hif_drv->cfg_values.passive_scan_time,
hif_drv->cfg_values.curr_tx_rate);
- up(&hif_drv->gtOsCfgValuesSem);
+ up(&hif_drv->sem_cfg_values);
clients_count++;
return result;
_fail_timer_2:
- up(&hif_drv->gtOsCfgValuesSem);
+ up(&hif_drv->sem_cfg_values);
del_timer_sync(&hif_drv->hConnectTimer);
del_timer_sync(&hif_drv->hScanTimer);
kthread_stop(hif_thread_handler);
@@ -4238,7 +4238,7 @@ s32 host_int_deinit(struct host_if_drv *hif_drv)
wilc_mq_destroy(&hif_msg_q);
}
- down(&hif_drv->gtOsCfgValuesSem);
+ down(&hif_drv->sem_cfg_values);
ret = remove_handler_in_list(hif_drv);
if (ret)
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index 90e2946..7b9930e 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -303,8 +303,8 @@ struct host_if_drv {
u8 assoc_bssid[ETH_ALEN];
struct cfg_param_val cfg_values;
-/* semaphores */
- struct semaphore gtOsCfgValuesSem;
+
+ struct semaphore sem_cfg_values;
struct semaphore hSemTestKeyBlock;
struct semaphore hSemTestDisconnectBlock;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH V2 03/64] staging: wilc1000: rename strCfgValues of struct host_if_drv
From: Leo Kim
This patch renames strCfgValues of struct host_if_drv to cfg_values
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 91 ---
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 47 insertions(+), 46 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 7216d83..135d4b3 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -535,7 +535,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
strWIDList[u8WidCnt].val = (s8
*)&strHostIFCfgParamAttr->cfg_attr_info.bss_type;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
- hif_drv->strCfgValues.bss_type =
(u8)strHostIFCfgParamAttr->cfg_attr_info.bss_type;
+ hif_drv->cfg_values.bss_type =
(u8)strHostIFCfgParamAttr->cfg_attr_info.bss_type;
} else {
PRINT_ER("check value 6 over\n");
result = -EINVAL;
@@ -549,7 +549,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
strWIDList[u8WidCnt].val = (s8
*)&strHostIFCfgParamAttr->cfg_attr_info.auth_type;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
- hif_drv->strCfgValues.auth_type =
(u8)strHostIFCfgParamAttr->cfg_attr_info.auth_type;
+ hif_drv->cfg_values.auth_type =
(u8)strHostIFCfgParamAttr->cfg_attr_info.auth_type;
} else {
PRINT_ER("Impossible value \n");
result = -EINVAL;
@@ -563,7 +563,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
strWIDList[u8WidCnt].val = (s8
*)&strHostIFCfgParamAttr->cfg_attr_info.auth_timeout;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
- hif_drv->strCfgValues.auth_timeout =
strHostIFCfgParamAttr->cfg_attr_info.auth_timeout;
+ hif_drv->cfg_values.auth_timeout =
strHostIFCfgParamAttr->cfg_attr_info.auth_timeout;
} else {
PRINT_ER("Range(1 ~ 65535) over\n");
result = -EINVAL;
@@ -577,7 +577,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
strWIDList[u8WidCnt].val = (s8
*)&strHostIFCfgParamAttr->cfg_attr_info.power_mgmt_mode;
strWIDList[u8WidCnt].type = WID_CHAR;
strWIDList[u8WidCnt].size = sizeof(char);
- hif_drv->strCfgValues.power_mgmt_mode =
(u8)strHostIFCfgParamAttr->cfg_attr_info.power_mgmt_mode;
+ hif_drv->cfg_values.power_mgmt_mode =
(u8)strHostIFCfgParamAttr->cfg_attr_info.power_mgmt_mode;
} else {
PRINT_ER("Invalide power mode\n");
result = -EINVAL;
@@ -591,7 +591,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
strWIDList[u8WidCnt].val = (s8
*)&strHostIFCfgParamAttr->cfg_attr_info.short_retry_limit;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
- hif_drv->strCfgValues.short_retry_limit =
strHostIFCfgParamAttr->cfg_attr_info.short_retry_limit;
+ hif_drv->cfg_values.short_retry_limit =
strHostIFCfgParamAttr->cfg_attr_info.short_retry_limit;
} else {
PRINT_ER("Range(1~256) over\n");
result = -EINVAL;
@@ -606,7 +606,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
- hif_drv->strCfgValues.long_retry_limit =
strHostIFCfgParamAttr->cfg_attr_info.long_retry_limit;
+ hif_drv->cfg_values.long_retry_limit =
strHostIFCfgParamAttr->cfg_attr_info.long_retry_limit;
} else {
PRINT_ER("Range(1~256) over\n");
result = -EINVAL;
@@ -620,7 +620,7 @@ static s32 Handle_CfgParam(struct host_if_drv *hif_drv,
strWIDList[u8WidCnt].val = (s8
*)&strHostIFCfgParamAttr->cfg_attr_info.frag_threshold;
strWIDList[u8WidCnt].type = WID_SHORT;
strWIDList[u8WidCnt].size = sizeof(u16);
- hif_drv->strCfgValues.frag_threshold =
strHostIFCfgParamAttr->cfg_attr_info.frag_threshold;
+ hif_drv->cfg_values.frag_threshold =
st
[PATCH V2 02/64] staging: wilc1000: rename au8AssociatedBSSID of struct host_if_drv
From: Leo Kim
This patch renames au8AssociatedBSSID of struct host_if_drv to assoc_bssid
to avoid CamelCase naming convention.
Signed-off-by: Leo Kim
Signed-off-by: Glen Lee
---
drivers/staging/wilc1000/host_interface.c | 8
drivers/staging/wilc1000/host_interface.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/wilc1000/host_interface.c
b/drivers/staging/wilc1000/host_interface.c
index 4e01dbd..7216d83 100644
--- a/drivers/staging/wilc1000/host_interface.c
+++ b/drivers/staging/wilc1000/host_interface.c
@@ -1581,7 +1581,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
if ((u8MacStatus == MAC_CONNECTED) &&
(strConnectInfo.u16ConnectStatus ==
SUCCESSFUL_STATUSCODE)) {
- memcpy(hif_drv->au8AssociatedBSSID,
+ memcpy(hif_drv->assoc_bssid,
hif_drv->usr_conn_req.pu8bssid,
ETH_ALEN);
}
}
@@ -1657,7 +1657,7 @@ static s32 Handle_RcvdGnrlAsyncInfo(struct host_if_drv
*hif_drv,
PRINT_ER("Connect result callback function is
NULL\n");
}
- eth_zero_addr(hif_drv->au8AssociatedBSSID);
+ eth_zero_addr(hif_drv->assoc_bssid);
hif_drv->usr_conn_req.ssidLen = 0;
kfree(hif_drv->usr_conn_req.pu8ssid);
@@ -1840,7 +1840,7 @@ static int Handle_Key(struct host_if_drv *hif_drv,
}
if (hif_drv->hif_state == HOST_IF_CONNECTED)
- memcpy(pu8keybuf, hif_drv->au8AssociatedBSSID,
ETH_ALEN);
+ memcpy(pu8keybuf, hif_drv->assoc_bssid,
ETH_ALEN);
else
PRINT_ER("Couldn't handle WPARxGtk while state
is not HOST_IF_CONNECTED\n");
@@ -2022,7 +2022,7 @@ static void Handle_Disconnect(struct host_if_drv *hif_drv)
hif_drv->hif_state = HOST_IF_IDLE;
- eth_zero_addr(hif_drv->au8AssociatedBSSID);
+ eth_zero_addr(hif_drv->assoc_bssid);
hif_drv->usr_conn_req.ssidLen = 0;
kfree(hif_drv->usr_conn_req.pu8ssid);
diff --git a/drivers/staging/wilc1000/host_interface.h
b/drivers/staging/wilc1000/host_interface.h
index dcdb9c6..fcfdd21 100644
--- a/drivers/staging/wilc1000/host_interface.h
+++ b/drivers/staging/wilc1000/host_interface.h
@@ -301,7 +301,7 @@ struct host_if_drv {
enum host_if_state hif_state;
- u8 au8AssociatedBSSID[ETH_ALEN];
+ u8 assoc_bssid[ETH_ALEN];
struct cfg_param_val strCfgValues;
/* semaphores */
struct semaphore gtOsCfgValuesSem;
--
1.9.1
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 38/80] staging: wilc1000: rename au8Bssid of struct ba_session_info
On 2015년 10월 29일 01:56, Dan Carpenter wrote: On Wed, Oct 28, 2015 at 03:59:58PM +0900, Glen Lee wrote: From: Leo Kim This patch renames au8Bssid of struct ba_session_info to bssid to avoid CamelCase naming convention. And, some debug logs modified because 80 ending line over warnings. Signed-off-by: Leo Kim Signed-off-by: Glen Lee --- drivers/staging/wilc1000/host_interface.c | 32 ++- drivers/staging/wilc1000/host_interface.h | 2 +- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 9ad98fd..48a232f 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -2715,10 +2715,14 @@ static s32 Handle_AddBASession(struct host_if_drv *hif_drv, int AddbaTimeout = 100; char *ptr = NULL; - PRINT_D(HOSTINF_DBG, "Opening Block Ack session with\nBSSID = %.2x:%.2x:%.2x\nTID=%d\nBufferSize == %d\nSessionTimeOut = %d\n", - strHostIfBASessionInfo->au8Bssid[0], - strHostIfBASessionInfo->au8Bssid[1], - strHostIfBASessionInfo->au8Bssid[2], + PRINT_D(HOSTINF_DBG, "Opening Block Ack session with \ + \nBSSID = %.2x:%.2x:%.2x \ + \nBufferSize == %d \ + \nSessionTimeOut = %d \ + \nTID=%d\n", + strHostIfBASessionInfo->bssid[0], + strHostIfBASessionInfo->bssid[1], + strHostIfBASessionInfo->bssid[2], strHostIfBASessionInfo->u16BufferSize, strHostIfBASessionInfo->u16SessionTimeout, strHostIfBASessionInfo->u8Ted); This should be a bunch of printks so that we have the correct debug level at the start of each line. Thank you for your advice. We will use netdev_xxx print format later with a bunch of prints when the function gets access net_device. For now, continuation \ will be deleted and will be like, PRINT_D(HOSTINF_DBG, "Opening Block Ack session with BSSID = %02x:%02x:%02x TID=%d BufferSize == %d SessionTimeOut = %d\n", etc... regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 5/5] staging: lustre: libcfs.h: remove IS_PO2 and __is_po2
Removes IS_PO2 and __is_po2 since the uses of IS_PO2 have
been replaced by is_power_of_2
Signed-off-by: Aya Mahfouz
---
v2:
-became patch number 5 in the series
v3:
-no change
drivers/staging/lustre/include/linux/libcfs/libcfs.h | 7 ---
1 file changed, 7 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
index 4d74e8a..7f76b20 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
@@ -42,13 +42,6 @@
#include "curproc.h"
-static inline int __is_po2(unsigned long long val)
-{
- return !(val & (val - 1));
-}
-
-#define IS_PO2(val) __is_po2((unsigned long long)(val))
-
#define LOWEST_BIT_SET(x) ((x) & ~((x) - 1))
/*
--
2.4.2
--
Kind Regards,
Aya Saif El-yazal Mahfouz
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 4/5] staging: lustre: selftest.h: replace IS_PO2 by is_power_of_2
Replaces IS_PO2 by is_power_of_2. It is more accurate to use
is_power_of_2 since it returns 1 for numbers that are powers
of 2 only whereas IS_PO2 returns 1 for 0 and numbers that are
powers of 2.
Signed-off-by: Aya Mahfouz
---
v2:
-added new patch in patch set for selftest.h
v3:
-fixed checkpatch.pl warning
drivers/staging/lustre/lnet/selftest/selftest.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lnet/selftest/selftest.h
b/drivers/staging/lustre/lnet/selftest/selftest.h
index 8a77d3f..15b3b34 100644
--- a/drivers/staging/lustre/lnet/selftest/selftest.h
+++ b/drivers/staging/lustre/lnet/selftest/selftest.h
@@ -585,7 +585,7 @@ swi_state2str (int state)
do { \
int __I = 2;\
while (!(cond)) { \
- CDEBUG(IS_PO2(++__I) ? D_WARNING : D_NET, \
+ CDEBUG(is_power_of_2(++__I) ? D_WARNING : D_NET,\
fmt, ## __VA_ARGS__);\
spin_unlock(&(lock)); \
\
--
2.4.2
--
Kind Regards,
Aya Saif El-yazal Mahfouz
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 3/5] staging: lustre: workitem.c: replace IS_PO2 by is_power_of_2
Replaces IS_PO2 by is_power_of_2. It is more accurate to use
is_power_of_2 since it returns 1 for numbers that are powers
of 2 only whereas IS_PO2 returns 1 for 0 and numbers that are
powers of 2.
Reviewed-by: Andreas Dilger
Signed-off-by: Aya Mahfouz
---
v2:
-changed commit message
-added Andreas Reviewed by tag
v3:
-no change
drivers/staging/lustre/lustre/libcfs/workitem.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/libcfs/workitem.c
b/drivers/staging/lustre/lustre/libcfs/workitem.c
index e1143a5..268dd68 100644
--- a/drivers/staging/lustre/lustre/libcfs/workitem.c
+++ b/drivers/staging/lustre/lustre/libcfs/workitem.c
@@ -325,7 +325,7 @@ cfs_wi_sched_destroy(struct cfs_wi_sched *sched)
spin_lock(&cfs_wi_data.wi_glock);
while (sched->ws_nthreads > 0) {
- CDEBUG(IS_PO2(++i) ? D_WARNING : D_NET,
+ CDEBUG(is_power_of_2(++i) ? D_WARNING : D_NET,
"waiting for %d threads of WI sched[%s] to terminate\n",
sched->ws_nthreads, sched->ws_name);
--
2.4.2
--
Kind Regards,
Aya Saif El-yazal Mahfouz
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 2/5] staging: lustre: hash.c: Replace IS_PO2 by is_power_of_2
Replaces IS_PO2 by is_power_of_2. It is more accurate to use
is_power_of_2 since it returns 1 for numbers that are powers
of 2 only whereas IS_PO2 returns 1 for 0 and numbers that are
powers of 2.
Reviewed-by: Andreas Dilger
Signed-off-by: Aya Mahfouz
---
v2:
-changed commit message
-added Andreas Reviewed by tag
v3:
-fixed checkpatch.pl warning
drivers/staging/lustre/lustre/libcfs/hash.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c
b/drivers/staging/lustre/lustre/libcfs/hash.c
index 0308744..ec26916 100644
--- a/drivers/staging/lustre/lustre/libcfs/hash.c
+++ b/drivers/staging/lustre/lustre/libcfs/hash.c
@@ -109,6 +109,7 @@
#include "../../include/linux/libcfs/libcfs.h"
#include
+#include
#if CFS_HASH_DEBUG_LEVEL >= CFS_HASH_DEBUG_1
static unsigned int warn_on_depth = 8;
@@ -1794,7 +1795,7 @@ cfs_hash_rehash_cancel_locked(struct cfs_hash *hs)
for (i = 2; cfs_hash_is_rehashing(hs); i++) {
cfs_hash_unlock(hs, 1);
/* raise console warning while waiting too long */
- CDEBUG(IS_PO2(i >> 3) ? D_WARNING : D_INFO,
+ CDEBUG(is_power_of_2(i >> 3) ? D_WARNING : D_INFO,
"hash %s is still rehashing, rescheded %d\n",
hs->hs_name, i - 1);
cond_resched();
--
2.4.2
--
Kind Regards,
Aya Saif El-yazal Mahfouz
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 1/5] staging: lustre: ldlm_extent.c: replace IS_PO2 by is_power_of_2
Replaces IS_PO2 by is_power_of_2. It is more accurate to use is_power_of_2 since it returns 1 for numbers that are powers of 2 only whereas IS_PO2 returns 1 for 0 and numbers that are powers of 2. Signed-off-by: Aya Mahfouz --- v2: -changed commit message v3: -no change drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c index c787888..9c70f31 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_extent.c @@ -149,7 +149,7 @@ static inline int lock_mode_to_index(ldlm_mode_t mode) int index; LASSERT(mode != 0); - LASSERT(IS_PO2(mode)); + LASSERT(is_power_of_2(mode)); for (index = -1; mode; index++) mode >>= 1; LASSERT(index < LCK_MODE_NUM); -- 2.4.2 -- Kind Regards, Aya Saif El-yazal Mahfouz ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH v3 0/5] Remove uses and definition of IS_PO2
Concerned with the removal of IS_PO2 by replacing its uses with is_power_of_2 and then removing the definition. The second version handled warnings indicated by kbuild test robot. The third version handled checkpatch.pl warnings indicated by Sudip Mukherjee. Aya Mahfouz (5): staging: lustre: ldlm_extent.c: replace IS_PO2 by is_power_of_2 staging: lustre: hash.c: Replace IS_PO2 by is_power_of_2 staging: lustre: workitem.c: replace IS_PO2 by is_power_of_2 staging: lustre: selftest.h: replace IS_PO2 by is_power_of_2 staging: lustre: libcfs.h: remove IS_PO2 and __is_po2 drivers/staging/lustre/include/linux/libcfs/libcfs.h | 7 --- drivers/staging/lustre/lnet/selftest/selftest.h | 2 +- drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +- drivers/staging/lustre/lustre/libcfs/hash.c | 3 ++- drivers/staging/lustre/lustre/libcfs/workitem.c | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) -- 2.4.2 -- Kind Regards, Aya Saif El-yazal Mahfouz ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [RESEND PATCH v2 2/5] staging: lustre: hash.c: Replace IS_PO2 by is_power_of_2
On Wed, Oct 28, 2015 at 12:11:59PM +0530, Sudip Mukherjee wrote: > On Tue, Oct 27, 2015 at 07:43:34PM +0200, Aya Mahfouz wrote: > > Replaces IS_PO2 by is_power_of_2. It is more accurate to use > > is_power_of_2 since it returns 1 for numbers that are powers > > of 2 only whereas IS_PO2 returns 1 for 0 and numbers that are > > powers of 2. > > > > Reviewed-by: Andreas Dilger > > Signed-off-by: Aya Mahfouz > > --- > > v2: > > -changed commit message > > -added Andreas Reviewed by tag > > > > drivers/staging/lustre/lustre/libcfs/hash.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c > > b/drivers/staging/lustre/lustre/libcfs/hash.c > > index 6f4c7d4..4b5e79a 100644 > > --- a/drivers/staging/lustre/lustre/libcfs/hash.c > > +++ b/drivers/staging/lustre/lustre/libcfs/hash.c > > @@ -109,6 +109,8 @@ > > > > #include "../../include/linux/libcfs/libcfs.h" > > #include > > +#include > > + > > This extra blank line will introduce new checkpatch error of "multiple > blank lines" > > regards > sudip Thanks Sudip! I will handle your comments on the patchset and resend it. -- Kind Regards, Aya Saif El-yazal Mahfouz ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 04/12] staging: wilc1000: wilc_wlan_txq_add_mgmt_pkt: add new argument dev
On Wed, Oct 28, 2015 at 04:48:20PM +0900, Glen Lee wrote: > This patch adds new argument struct net_device *dev and pass argument > struct net_device to the function. > > Signed-off-by: Glen Lee > --- > drivers/staging/wilc1000/linux_mon.c | 2 +- > drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 4 ++-- > drivers/staging/wilc1000/wilc_wlan.c | 3 ++- > drivers/staging/wilc1000/wilc_wlan.h | 4 ++-- > 4 files changed, 7 insertions(+), 6 deletions(-) Doesn't apply, please rebase and resend this whole series. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 18/80] staging: wilc1000: rename au8AssociatedBSSID of struct host_if_drv
On Wed, Oct 28, 2015 at 03:59:38PM +0900, Glen Lee wrote: > From: Leo Kim > > This patch renames au8AssociatedBSSID of struct host_if_drv to assoc_bssid > to avoid CamelCase naming convention. > > Signed-off-by: Leo Kim > Signed-off-by: Glen Lee > --- > drivers/staging/wilc1000/host_interface.c | 8 > drivers/staging/wilc1000/host_interface.h | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) Doesn't apply as I didn't take patch 17 for the obvious reason. Please fix up and resend the series of what I didn't take. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [PATCH 00/16] staging: comedi: comedi_test: enhancements
On Tuesday, October 27, 2015 9:59 AM, Ian Abbott wrote: > The "comedi_test" module is a driver for a dummy COMEDI device. It has > an analog input subdevice and an analog output subdevice. The analog > input subdevice supports COMEDI asynchronous acquisition commands using > waveform generators to generate the input data for each channel. A > kernel timer is used to driver the acquisition. > > This series of patches cleans up the driver, enhances the existing > asynchronous command support on the analog input subdevice, and adds > asynchronous command support on the analog output subdevice. > > 01) staging: comedi: comedi_test: reformat multi-line comments > 02) staging: comedi: comedi_test: saturate fake waveform values > 03) staging: comedi: comedi_test: remove nano_per_micro > 04) staging: comedi: comedi_test: limit maximum convert_arg > 05) staging: comedi: comedi_test: support scan_begin_src == TRIG_FOLLOW > 06) staging: comedi: comedi_test: move modulo operations for waveform > 07) staging: comedi: comedi_test: use unsigned int for waveform timing > 08) staging: comedi: comedi_test: simplify time since last AI scan > 09) staging: comedi: comedi_test: rename members for AI commands > 10) staging: comedi: comedi_test: rename waveform members > 11) staging: comedi: comedi_test: make timer rate similar to scan rate > 12) staging: comedi: comedi_test: use unsigned short for loopback values > 13) staging: comedi: comedi_test: allow read-back of AO channels > 14) staging: comedi: comedi_test: handle partial scans in timer routine > 15) staging: comedi: comedi_test: rename waveform_ai_interrupt() > 16) staging: comedi: comedi_test: implement commands on AO subdevice > > drivers/staging/comedi/drivers/comedi_test.c | 565 > --- > 1 file changed, 416 insertions(+), 149 deletions(-) Reviewed-by: H Hartley Sweeten ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 10/10] staging: lustre: remove white space in hash.c
On Wed, Oct 28, 2015 at 12:54:31PM -0400, James Simmons wrote: > From: James Simmons > > Cleanup all the unneeded white space in hash.c. > > Signed-off-by: James Simmons > --- > drivers/staging/lustre/lustre/libcfs/hash.c | 336 > ++- > 1 files changed, 174 insertions(+), 162 deletions(-) > > diff --git a/drivers/staging/lustre/lustre/libcfs/hash.c > b/drivers/staging/lustre/lustre/libcfs/hash.c > index 0308744..c5921f7 100644 > --- a/drivers/staging/lustre/lustre/libcfs/hash.c > +++ b/drivers/staging/lustre/lustre/libcfs/hash.c > @@ -106,9 +106,9 @@ > * Now we support both locked iteration & lockless iteration of hash > * table. Also, user can break the iteration by return 1 in callback. > */ > +#include > > #include "../../include/linux/libcfs/libcfs.h" > -#include Again, not a "whitespace fix". ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 08/10] staging: lustre: remove white space in libcfs_hash.h
On Wed, Oct 28, 2015 at 12:54:29PM -0400, James Simmons wrote: > From: James Simmons > > Cleanup all the unneeded white space in libcfs_hash.h. > > Signed-off-by: James Simmons > --- > .../lustre/include/linux/libcfs/libcfs_hash.h | 147 > ++-- > 1 files changed, 73 insertions(+), 74 deletions(-) > > diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h > b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h > index 70b8b29..5df8ba2 100644 > --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h > +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h > @@ -41,6 +41,9 @@ > > #ifndef __LIBCFS_HASH_H__ > #define __LIBCFS_HASH_H__ > + > +#include > + > /* > * Knuth recommends primes in approximately golden ratio to the maximum > * integer representable by a machine word for multiplicative hashing. > @@ -56,22 +59,13 @@ > /* 2^63 + 2^61 - 2^57 + 2^54 - 2^51 - 2^18 + 1 */ > #define CFS_GOLDEN_RATIO_PRIME_64 0x9e37fffc0001ULL > > -/* > - * Ideally we would use HAVE_HASH_LONG for this, but on linux we configure > - * the linux kernel and user space at the same time, so we need to > differentiate > - * between them explicitly. If this is not needed on other architectures, > then > - * we'll need to move the functions to architecture specific headers. > - */ > - > -#include > - That's not "cleaning up whitespace", that's "deleting unused/unneeded stuff. Please be more careful and only do one thing per patch, you know better than to try to sneak other changes in. I'll stop here in applying this series, please fix up and resend. greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [lustre-devel] [PATCH 5/5] staging:lustre: Update license and copyright for kernel comm
On Wed, Oct 28, 2015 at 07:00:29PM +, Simmons, James A. wrote: > >> > >> - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf > >> - * > >> - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa > >> Clara, > >> - * CA 95054 USA or visit www.sun.com if you need additional information or > >> - * have any questions. > > > >That text is in every files. You should kill all references. > > That would be a mighty big patch. I can take "mighty big patches" like this quite easily, please send it to me, don't mess with this "development branch of an external tree" nonsense, which I'm _REALLY_ getting tired of. Please drop that tree and only use the in-kernel version. If that doesn't work for you, then we need to drop the in-kernel version as it's pretty obvious no one is actually using this in-kernel code. thanks, greg k-h ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [lustre-devel] [PATCH 09/10] staging: lustre: fix remaining checkpatch issues for libcfs_hash.h
On 2015/10/28, 10:54, "lustre-devel on behalf of James Simmons"
wrote:
>From: James Simmons
>
>Final cleanup to make libcfs_hash.h completely kernel standard
>compliant.
>
>Signed-off-by: James Simmons
>---
> .../lustre/include/linux/libcfs/libcfs_hash.h | 16
>++--
> 1 files changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
>b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
>index 5df8ba2..563b2b4 100644
>--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
>+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
>@@ -62,7 +62,8 @@
> /** disable debug */
> #define CFS_HASH_DEBUG_NONE 0
> /** record hash depth and output to console when it's too deep,
>- * computing overhead is low but consume more memory */
>+ * computing overhead is low but consume more memory
>+ */
Typically, multi-line comments have the leading /* on a separate line
from the first line of text. If you are changing all these comments
you may as well make it consistent with the kernel style.
Cheers, Andreas
> #define CFS_HASH_DEBUG_1 1
> /** expensive, check key validation */
> #define CFS_HASH_DEBUG_2 2
>@@ -158,7 +159,8 @@ enum cfs_hash_tag {
>*/
> CFS_HASH_NBLK_CHANGE= 1 << 13,
> /** NB, we typed hs_flags as __u16, please change it
>- * if you need to extend >=16 flags */
>+ * if you need to extend >=16 flags
>+ */
> };
>
> /** most used attributes */
>@@ -206,7 +208,8 @@ enum cfs_hash_tag {
>
> struct cfs_hash {
> /** serialize with rehash, or serialize all operations if
>- * the hash-table has CFS_HASH_NO_BKTLOCK */
>+ * the hash-table has CFS_HASH_NO_BKTLOCK
>+ */
> union cfs_hash_lock hs_lock;
> /** hash operations */
> struct cfs_hash_ops *hs_ops;
>@@ -375,7 +378,8 @@ cfs_hash_with_no_itemref(struct cfs_hash *hs)
> {
> /* hash-table doesn't keep refcount on item,
>* item can't be removed from hash unless it's
>- * ZERO refcount */
>+ * ZERO refcount.
>+ */
> return (hs->hs_flags & CFS_HASH_NO_ITEMREF) != 0;
> }
>
>@@ -820,7 +824,7 @@ cfs_hash_djb2_hash(const void *key, size_t size,
>unsigned mask)
> {
> unsigned i, hash = 5381;
>
>- LASSERT(key != NULL);
>+ LASSERT(key);
>
> for (i = 0; i < size; i++)
> hash = hash * 33 + ((char *)key)[i];
>@@ -848,7 +852,7 @@ cfs_hash_u64_hash(const __u64 key, unsigned mask)
>
> /** iterate over all buckets in @bds (array of struct cfs_hash_bd) */
> #define cfs_hash_for_each_bd(bds, n, i) \
>- for (i = 0; i < n && (bds)[i].bd_bucket != NULL; i++)
>+ for (i = 0; i < n && (bds)[i].bd_bucket; i++)
>
> /** iterate over all buckets of @hs */
> #define cfs_hash_for_each_bucket(hs, bd, pos) \
>--
>1.7.1
>
>___
>lustre-devel mailing list
>lustre-de...@lists.lustre.org
>http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org
>
Cheers, Andreas
--
Andreas Dilger
Lustre Software Architect
Intel High Performance Data Division
___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [lustre-devel] [PATCH 08/10] staging: lustre: remove white space in libcfs_hash.h
On 2015/10/28, 10:54, "lustre-devel on behalf of James Simmons"
wrote:
>From: James Simmons
>
>Cleanup all the unneeded white space in libcfs_hash.h.
>
>Signed-off-by: James Simmons
Minor note - it would be better to keep these two email addresses
consistent.
>struct cfs_hash_bd {
>- struct cfs_hash_bucket *bd_bucket; /**< address of bucket */
>- unsigned intbd_offset; /**< offset in bucket */
>+ /**< address of bucket */
>+ struct cfs_hash_bucket *bd_bucket;
>+ /**< offset in bucket */
>+ unsigned int bd_offset;
> };
The "/**< ... */" marker means "the field to the left", but if you are
moving these to the line before the field you should just use "/* ... */".
Cheers, Andreas
>
>-#define CFS_HASH_NAME_LEN16 /**< default name length */
>-#define CFS_HASH_BIGNAME_LEN 64 /**< bigname for param tree */
>+#define CFS_HASH_NAME_LEN 16 /**< default name length */
>+#define CFS_HASH_BIGNAME_LEN 64 /**< bigname for param tree */
>
>-#define CFS_HASH_BKT_BITS3 /**< default bits of bucket */
>-#define CFS_HASH_BITS_MAX30 /**< max bits of bucket */
>-#define CFS_HASH_BITS_MINCFS_HASH_BKT_BITS
>+#define CFS_HASH_BKT_BITS 3 /**< default bits of bucket */
>+#define CFS_HASH_BITS_MAX 30 /**< max bits of bucket */
>+#define CFS_HASH_BITS_MIN CFS_HASH_BKT_BITS
>
> /**
> * common hash attributes.
>@@ -133,41 +129,41 @@ enum cfs_hash_tag {
>*/
> CFS_HASH_NO_LOCK= 1 << 0,
> /** no bucket lock, use one spinlock to protect the whole hash */
>- CFS_HASH_NO_BKTLOCK = 1 << 1,
>+ CFS_HASH_NO_BKTLOCK = 1 << 1,
> /** rwlock to protect bucket */
>- CFS_HASH_RW_BKTLOCK = 1 << 2,
>+ CFS_HASH_RW_BKTLOCK = 1 << 2,
> /** spinlock to protect bucket */
>- CFS_HASH_SPIN_BKTLOCK = 1 << 3,
>+ CFS_HASH_SPIN_BKTLOCK = 1 << 3,
> /** always add new item to tail */
>- CFS_HASH_ADD_TAIL = 1 << 4,
>+ CFS_HASH_ADD_TAIL = 1 << 4,
> /** hash-table doesn't have refcount on item */
>- CFS_HASH_NO_ITEMREF = 1 << 5,
>+ CFS_HASH_NO_ITEMREF = 1 << 5,
> /** big name for param-tree */
> CFS_HASH_BIGNAME= 1 << 6,
> /** track global count */
> CFS_HASH_COUNTER= 1 << 7,
> /** rehash item by new key */
>- CFS_HASH_REHASH_KEY = 1 << 8,
>+ CFS_HASH_REHASH_KEY = 1 << 8,
> /** Enable dynamic hash resizing */
>- CFS_HASH_REHASH = 1 << 9,
>+ CFS_HASH_REHASH = 1 << 9,
> /** can shrink hash-size */
>- CFS_HASH_SHRINK = 1 << 10,
>+ CFS_HASH_SHRINK = 1 << 10,
> /** assert hash is empty on exit */
>- CFS_HASH_ASSERT_EMPTY = 1 << 11,
>+ CFS_HASH_ASSERT_EMPTY = 1 << 11,
> /** record hlist depth */
>- CFS_HASH_DEPTH= 1 << 12,
>+ CFS_HASH_DEPTH = 1 << 12,
> /**
>* rehash is always scheduled in a different thread, so current
>* change on hash table is non-blocking
>*/
>- CFS_HASH_NBLK_CHANGE= 1 << 13,
>+ CFS_HASH_NBLK_CHANGE= 1 << 13,
> /** NB, we typed hs_flags as __u16, please change it
>* if you need to extend >=16 flags */
> };
>
> /** most used attributes */
>-#define CFS_HASH_DEFAULT (CFS_HASH_RW_BKTLOCK | \
>- CFS_HASH_COUNTER | CFS_HASH_REHASH)
>+#define CFS_HASH_DEFAULT (CFS_HASH_RW_BKTLOCK | \
>+ CFS_HASH_COUNTER | CFS_HASH_REHASH)
>
> /**
> * cfs_hash is a hash-table implementation for general purpose, it can
>support:
>@@ -211,7 +207,7 @@ enum cfs_hash_tag {
> struct cfs_hash {
> /** serialize with rehash, or serialize all operations if
>* the hash-table has CFS_HASH_NO_BKTLOCK */
>- union cfs_hash_lock hs_lock;
>+ union cfs_hash_lock hs_lock;
> /** hash operations */
> struct cfs_hash_ops *hs_ops;
> /** hash lock operations */
>@@ -219,57 +215,57 @@ struct cfs_hash {
> /** hash list operations */
> struct cfs_hash_hlist_ops *hs_hops;
> /** hash buckets-table */
>- struct cfs_hash_bucket **hs_buckets;
>+ struct cfs_hash_bucket **hs_buckets;
> /** total number of items on this hash-table */
>- atomic_ths_count;
>+ atomic_ths_count;
> /** hash flags, see cfs_hash_tag for detail */
>- __u16 hs_flags;
>+ __u16 hs_flags;
> /** # of extra-bytes for bucket, for user saving extended attributes */
>- __u16 hs_extra_bytes;
>+ __u16 hs_extra_bytes;
> /** wants to iterate */
>- __u8hs_iterating;
>+ __u8hs_iterating;
> /*
Re: [PATCH 2/2] drivers:staging:gdm724x Fix Alignment should match open parenthesis
On Wed, 2015-10-28 at 19:13 +0100, Bogicevic Sasa wrote: > This fixes all Alignment should match open parenthesis > messages from checkpatch.pl What you suggest is not at all generally accepted kernel style. > diff --git a/drivers/staging/gdm724x/gdm_lte.c > b/drivers/staging/gdm724x/gdm_lte.c [] > @@ -161,12 +161,15 @@ static int gdm_lte_emulate_arp(struct sk_buff *skb_in, > u32 nic_type) > return -ENOMEM; > skb_reserve(skb_out, NET_IP_ALIGN); > > - memcpy(skb_put(skb_out, mac_header_len), mac_header_data, > + memcpy( > + skb_put(skb_out, mac_header_len), mac_header_data, > mac_header_len); What's desired here is: memcpy(skb_put(skb_out, mac_header_len), mac_header_data, mac_header_len); Second line should be: [tab][7 spaces]mac_header_len); etc... btw: Please run your _patches_ through checkpatch.pl, not just use it to find style issues in files. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 38/80] staging: wilc1000: rename au8Bssid of struct ba_session_info
On Wed, 2015-10-28 at 19:56 +0300, Dan Carpenter wrote: > On Wed, Oct 28, 2015 at 03:59:58PM +0900, Glen Lee wrote: > > From: Leo Kim > > > > This patch renames au8Bssid of struct ba_session_info to bssid > > to avoid CamelCase naming convention. > > And, some debug logs modified because 80 ending line over warnings. Don't worry about some 80 column warnings. > > diff --git a/drivers/staging/wilc1000/host_interface.c > > b/drivers/staging/wilc1000/host_interface.c [] > > @@ -2715,10 +2715,14 @@ static s32 Handle_AddBASession(struct host_if_drv > > *hif_drv, > > int AddbaTimeout = 100; > > char *ptr = NULL; > > > > - PRINT_D(HOSTINF_DBG, "Opening Block Ack session with\nBSSID = > > %.2x:%.2x:%.2x\nTID=%d\nBufferSize == %d\nSessionTimeOut = %d\n", > > - strHostIfBASessionInfo->au8Bssid[0], > > - strHostIfBASessionInfo->au8Bssid[1], > > - strHostIfBASessionInfo->au8Bssid[2], > > + PRINT_D(HOSTINF_DBG, "Opening Block Ack session with \ > > + \nBSSID = %.2x:%.2x:%.2x \ > > + \nBufferSize == %d \ > > + \nSessionTimeOut = %d \ > > + \nTID=%d\n", > > + strHostIfBASessionInfo->bssid[0], > > + strHostIfBASessionInfo->bssid[1], > > + strHostIfBASessionInfo->bssid[2], > > strHostIfBASessionInfo->u16BufferSize, > > strHostIfBASessionInfo->u16SessionTimeout, > > strHostIfBASessionInfo->u8Ted); > > This should be a bunch of printks so that we have the correct debug > level at the start of each line. Also, don't use continuation \ as this adds undesired whitespace for each new line Realistically, this should just be a single line output. PRINT_D(HOSTINF_DBG, "Opening Block Ack session with BSSID = %02x:%02x:%02x TID=%d BufferSize == %d SessionTimeOut = %d\n", etc... But why are only 3 bytes of the bssid desired/emitted? ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[RESEND PATCH v2] Staging: wilc1000: Prefer eth_broadcast_addr over memset()
This patch is to the host_interface.c that fixes up following warning by checkpatch: -prefer eth_broadcast_addr() over memset() Signed-off-by: Punit Vara --- Applied on updated staging tree. drivers/staging/wilc1000/host_interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 5f81eab..53e21cd 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -4642,7 +4642,7 @@ s32 host_int_del_station(struct host_if_drv *hif_drv, const u8 *pu8MacAddr) msg.drv = hif_drv; if (!pu8MacAddr) - memset(pstrDelStationMsg->mac_addr, 255, ETH_ALEN); + eth_broadcast_addr(pstrDelStationMsg->mac_addr); else memcpy(pstrDelStationMsg->mac_addr, pu8MacAddr, ETH_ALEN); -- 2.5.3 ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
RE: [lustre-devel] [PATCH 5/5] staging:lustre: Update license and copyright for kernel comm
>> >> - * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf >> - * >> - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, >> - * CA 95054 USA or visit www.sun.com if you need additional information or >> - * have any questions. > >That text is in every files. You should kill all references. That would be a mighty big patch. A patch already exist in our development branch to update the copyright so that will be eventually backported to the staging tree. I can look into updating the rest after the copyright patch lands. Then I will port to the staging tree. ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
Re: [PATCH 2/2] drivers:staging:gdm724x Fix Alignment should match open parenthesis
On Wed, Oct 28, 2015 at 07:13:24PM +0100, Bogicevic Sasa wrote: > This fixes all Alignment should match open parenthesis > messages from checkpatch.pl > > Signed-off-by: Bogicevic Sasa > --- > drivers/staging/gdm724x/gdm_lte.c | 69 > +-- > 1 file changed, 45 insertions(+), 24 deletions(-) > > diff --git a/drivers/staging/gdm724x/gdm_lte.c > b/drivers/staging/gdm724x/gdm_lte.c > index a8d2cff..a28e0d1 100644 > --- a/drivers/staging/gdm724x/gdm_lte.c > +++ b/drivers/staging/gdm724x/gdm_lte.c > @@ -161,12 +161,15 @@ static int gdm_lte_emulate_arp(struct sk_buff *skb_in, > u32 nic_type) > return -ENOMEM; > skb_reserve(skb_out, NET_IP_ALIGN); > > - memcpy(skb_put(skb_out, mac_header_len), mac_header_data, > + memcpy( > + skb_put(skb_out, mac_header_len), mac_header_data, > mac_header_len); No. This isn't the right way. Look at other code to see how it's done. regards, dan carpenter ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 2/2] drivers:staging:gdm724x Fix Alignment should match open parenthesis
This fixes all Alignment should match open parenthesis
messages from checkpatch.pl
Signed-off-by: Bogicevic Sasa
---
drivers/staging/gdm724x/gdm_lte.c | 69 +--
1 file changed, 45 insertions(+), 24 deletions(-)
diff --git a/drivers/staging/gdm724x/gdm_lte.c
b/drivers/staging/gdm724x/gdm_lte.c
index a8d2cff..a28e0d1 100644
--- a/drivers/staging/gdm724x/gdm_lte.c
+++ b/drivers/staging/gdm724x/gdm_lte.c
@@ -161,12 +161,15 @@ static int gdm_lte_emulate_arp(struct sk_buff *skb_in,
u32 nic_type)
return -ENOMEM;
skb_reserve(skb_out, NET_IP_ALIGN);
- memcpy(skb_put(skb_out, mac_header_len), mac_header_data,
+ memcpy(
+ skb_put(skb_out, mac_header_len), mac_header_data,
mac_header_len);
- memcpy(skb_put(skb_out, sizeof(struct arphdr)), arp_out,
- sizeof(struct arphdr));
- memcpy(skb_put(skb_out, sizeof(struct arpdata)), arp_data_out,
- sizeof(struct arpdata));
+ memcpy(
+ skb_put(skb_out, sizeof(struct arphdr)),
+ arp_out, sizeof(struct arphdr));
+ memcpy(
+ skb_put(skb_out, sizeof(struct arpdata)),
+ arp_data_out, sizeof(struct arpdata));
skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto;
skb_out->dev = skb_in->dev;
@@ -299,15 +302,16 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in,
u32 nic_type)
memcpy(&ipv6_out, ipv6_in, sizeof(struct ipv6hdr));
memcpy(ipv6_out.saddr.in6_u.u6_addr8, &na.target_address, 16);
- memcpy(ipv6_out.daddr.in6_u.u6_addr8,
+ memcpy(
+ ipv6_out.daddr.in6_u.u6_addr8,
ipv6_in->saddr.in6_u.u6_addr8, 16);
ipv6_out.payload_len = htons(sizeof(struct icmp6hdr) +
sizeof(struct neighbour_advertisement));
memcpy(icmp_na, &icmp6_out, sizeof(struct icmp6hdr));
- memcpy(icmp_na + sizeof(struct icmp6hdr), &na,
- sizeof(struct neighbour_advertisement));
-
+ memcpy(
+ icmp_na + sizeof(struct icmp6hdr),
+ &na, sizeof(struct neighbour_advertisement));
icmp6_out.icmp6_cksum = icmp6_checksum(&ipv6_out,
(u16 *)icmp_na, sizeof(icmp_na));
} else {
@@ -325,13 +329,21 @@ static int gdm_lte_emulate_ndp(struct sk_buff *skb_in,
u32 nic_type)
return -ENOMEM;
skb_reserve(skb_out, NET_IP_ALIGN);
- memcpy(skb_put(skb_out, mac_header_len), mac_header_data,
+ memcpy(
+ skb_put(skb_out, mac_header_len),
+ mac_header_data,
mac_header_len);
- memcpy(skb_put(skb_out, sizeof(struct ipv6hdr)), &ipv6_out,
+ memcpy(
+ skb_put(skb_out, sizeof(struct ipv6hdr)),
+ &ipv6_out,
sizeof(struct ipv6hdr));
- memcpy(skb_put(skb_out, sizeof(struct icmp6hdr)), &icmp6_out,
+ memcpy(
+ skb_put(skb_out, sizeof(struct icmp6hdr)),
+ &icmp6_out,
sizeof(struct icmp6hdr));
- memcpy(skb_put(skb_out, sizeof(struct neighbour_advertisement)), &na,
+ memcpy(
+ skb_put(skb_out, sizeof(struct neighbour_advertisement)),
+ &na,
sizeof(struct neighbour_advertisement));
skb_out->protocol = ((struct ethhdr *)mac_header_data)->h_proto;
@@ -529,7 +541,8 @@ static int gdm_lte_event_send(struct net_device *dev, char
*buf, int len)
+ HCI_HEADER_SIZE);
}
-static void gdm_lte_event_rcv(struct net_device *dev, u16 type,
+static void gdm_lte_event_rcv(
+ struct net_device *dev, u16 type,
void *msg, int len)
{
struct nic *nic = netdev_priv(dev);
@@ -571,8 +584,11 @@ static u8 find_dev_index(u32 nic_type)
return index;
}
-static void gdm_lte_netif_rx(struct net_device *dev, char *buf,
- int len, int flagged_nic_type)
+static void gdm_lte_netif_rx(
+ struct net_device *dev,
+ char *buf,
+ int len,
+ int flagged_nic_type)
{
u32 nic_type;
struct nic *nic;
@@ -696,10 +712,12 @@ static void gdm_lte_multi_sdu_pkt(struct phy_dev
*phy_dev, char *buf, int len)
u32 nic_type;
u8 index;
- hci_len = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev),
- multi_sdu->len);
- num_packet = gdm_dev16_to_cpu(phy_dev->get_endian(phy_dev->priv_dev),
- multi_sdu->num_packet);
+ hci_len = gdm_dev16_to_cpu(
+ phy_dev->get_endian(phy_dev->priv_dev),
+
RE: [PATCH net-next] hyperv: Add handler for RNDIS_STATUS_NETWORK_CHANGE event
> -Original Message- > From: Richard Weinberger [mailto:richard.weinber...@gmail.com] > Sent: Tuesday, October 27, 2015 6:36 PM > To: David Miller > Cc: Haiyang Zhang ; o...@aepfle.de; Greg Kroah- > Hartman ; net...@vger.kernel.org; > jasow...@redhat.com; driverdev-devel@linuxdriverproject.org; LKML > > Subject: Re: [PATCH net-next] hyperv: Add handler for > RNDIS_STATUS_NETWORK_CHANGE event > > On Mon, Jun 23, 2014 at 10:10 PM, David Miller > wrote: > > From: Haiyang Zhang > > Date: Mon, 23 Jun 2014 16:09:59 + > > > >> So, what's the equivalent or similar command to "network restart" on > >> SLES12? Could you update the command line for the usermodehelper > when > >> porting this patch to SLES 12? > > > > No, you are not going to keep the usermodehelper invocation in your > > driver please remove it. It is absolutely inappropriate, and I > > strictly do not want to keep it in there because other people will > > copy it and then we'll have a real mess on our hands. > > Sorry for digging up this old thread. > While talking with some guys about usermodehelper abuses I came across > this gem. > Mainline still contains that "/etc/init.d/network restart" code. > Haiyang, care to cleanup? I will clean up the usermode helper soon. Thanks, - Haiyang ___ devel mailing list de...@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
[PATCH 08/10] staging: lustre: remove white space in libcfs_hash.h
From: James Simmons
Cleanup all the unneeded white space in libcfs_hash.h.
Signed-off-by: James Simmons
---
.../lustre/include/linux/libcfs/libcfs_hash.h | 147 ++--
1 files changed, 73 insertions(+), 74 deletions(-)
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
index 70b8b29..5df8ba2 100644
--- a/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
+++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
@@ -41,6 +41,9 @@
#ifndef __LIBCFS_HASH_H__
#define __LIBCFS_HASH_H__
+
+#include
+
/*
* Knuth recommends primes in approximately golden ratio to the maximum
* integer representable by a machine word for multiplicative hashing.
@@ -56,22 +59,13 @@
/* 2^63 + 2^61 - 2^57 + 2^54 - 2^51 - 2^18 + 1 */
#define CFS_GOLDEN_RATIO_PRIME_64 0x9e37fffc0001ULL
-/*
- * Ideally we would use HAVE_HASH_LONG for this, but on linux we configure
- * the linux kernel and user space at the same time, so we need to
differentiate
- * between them explicitly. If this is not needed on other architectures, then
- * we'll need to move the functions to architecture specific headers.
- */
-
-#include
-
/** disable debug */
-#define CFS_HASH_DEBUG_NONE 0
+#define CFS_HASH_DEBUG_NONE0
/** record hash depth and output to console when it's too deep,
* computing overhead is low but consume more memory */
-#define CFS_HASH_DEBUG_1 1
+#define CFS_HASH_DEBUG_1 1
/** expensive, check key validation */
-#define CFS_HASH_DEBUG_2 2
+#define CFS_HASH_DEBUG_2 2
#define CFS_HASH_DEBUG_LEVEL CFS_HASH_DEBUG_NONE
@@ -108,16 +102,18 @@ struct cfs_hash_bucket {
* cfs_hash bucket descriptor, it's normally in stack of caller
*/
struct cfs_hash_bd {
- struct cfs_hash_bucket *bd_bucket; /**< address of bucket */
- unsigned intbd_offset; /**< offset in bucket */
+ /**< address of bucket */
+ struct cfs_hash_bucket *bd_bucket;
+ /**< offset in bucket */
+ unsigned int bd_offset;
};
-#define CFS_HASH_NAME_LEN 16 /**< default name length */
-#define CFS_HASH_BIGNAME_LEN 64 /**< bigname for param tree */
+#define CFS_HASH_NAME_LEN 16 /**< default name length */
+#define CFS_HASH_BIGNAME_LEN 64 /**< bigname for param tree */
-#define CFS_HASH_BKT_BITS 3 /**< default bits of bucket */
-#define CFS_HASH_BITS_MAX 30 /**< max bits of bucket */
-#define CFS_HASH_BITS_MIN CFS_HASH_BKT_BITS
+#define CFS_HASH_BKT_BITS 3 /**< default bits of bucket */
+#define CFS_HASH_BITS_MAX 30 /**< max bits of bucket */
+#define CFS_HASH_BITS_MIN CFS_HASH_BKT_BITS
/**
* common hash attributes.
@@ -133,41 +129,41 @@ enum cfs_hash_tag {
*/
CFS_HASH_NO_LOCK= 1 << 0,
/** no bucket lock, use one spinlock to protect the whole hash */
- CFS_HASH_NO_BKTLOCK = 1 << 1,
+ CFS_HASH_NO_BKTLOCK = 1 << 1,
/** rwlock to protect bucket */
- CFS_HASH_RW_BKTLOCK = 1 << 2,
+ CFS_HASH_RW_BKTLOCK = 1 << 2,
/** spinlock to protect bucket */
- CFS_HASH_SPIN_BKTLOCK = 1 << 3,
+ CFS_HASH_SPIN_BKTLOCK = 1 << 3,
/** always add new item to tail */
- CFS_HASH_ADD_TAIL = 1 << 4,
+ CFS_HASH_ADD_TAIL = 1 << 4,
/** hash-table doesn't have refcount on item */
- CFS_HASH_NO_ITEMREF = 1 << 5,
+ CFS_HASH_NO_ITEMREF = 1 << 5,
/** big name for param-tree */
CFS_HASH_BIGNAME= 1 << 6,
/** track global count */
CFS_HASH_COUNTER= 1 << 7,
/** rehash item by new key */
- CFS_HASH_REHASH_KEY = 1 << 8,
+ CFS_HASH_REHASH_KEY = 1 << 8,
/** Enable dynamic hash resizing */
- CFS_HASH_REHASH = 1 << 9,
+ CFS_HASH_REHASH = 1 << 9,
/** can shrink hash-size */
- CFS_HASH_SHRINK = 1 << 10,
+ CFS_HASH_SHRINK = 1 << 10,
/** assert hash is empty on exit */
- CFS_HASH_ASSERT_EMPTY = 1 << 11,
+ CFS_HASH_ASSERT_EMPTY = 1 << 11,
/** record hlist depth */
- CFS_HASH_DEPTH= 1 << 12,
+ CFS_HASH_DEPTH = 1 << 12,
/**
* rehash is always scheduled in a different thread, so current
* change on hash table is non-blocking
*/
- CFS_HASH_NBLK_CHANGE= 1 << 13,
+ CFS_HASH_NBLK_CHANGE= 1 << 13,
/** NB, we typed hs_flags as __u16, please change it
* if you need to extend >=16 flags */
};
/** most used attributes */
-#define CFS_HASH_DEFAULT (CFS_HASH_RW_BKTLOCK | \
- CFS_HASH_COUNTER | CFS_HASH_REHASH)
+#define CFS_HASH_DEFAULT (CFS_HASH_RW_BKTLOCK | \
+CFS_HASH_COUNTER | CFS_HASH_REHASH)
