diff mbox

[01/13] staging: wilc1000: add wilc to netdev private data structure

Message ID 1444987389-14151-1-git-send-email-tony.cho@atmel.com (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Tony Cho Oct. 16, 2015, 9:22 a.m. UTC 
From: Glen Lee <glen.lee@atmel.com>

This patch adds struct wilc to struct perInterface_wlan_t which is netdev
private data to access wilc via netdev_priv function and assigns wilc to
nic->wilc. The global variable wl will be replaced with netdev private data
member wilc step by step.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
Signed-off-by: Tony Cho <tony.cho@atmel.com>
---
 drivers/staging/wilc1000/linux_wlan.c         | 1 +
 drivers/staging/wilc1000/wilc_wfi_netdevice.h | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Greg KH Oct. 17, 2015, 5:01 a.m. UTC | #1 
On Fri, Oct 16, 2015 at 06:22:57PM +0900, Tony Cho wrote:
> From: Glen Lee <glen.lee@atmel.com>
> 
> This patch adds struct wilc to struct perInterface_wlan_t which is netdev
> private data to access wilc via netdev_priv function and assigns wilc to
> nic->wilc. The global variable wl will be replaced with netdev private data
> member wilc step by step.

Nice, this is a great series, but it doesn't apply :(

Please fix up and resend.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index 3cc4861..90c39b6 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1658,6 +1658,7 @@  int wilc_netdev_init(struct wilc **wilc)
 
 		nic->u8IfIdx = wl->vif_num;
 		nic->wilc_netdev = ndev;
+		nic->wilc = *wilc;
 		wl->vif[wl->vif_num].ndev = ndev;
 		wl->vif_num++;
 		ndev->netdev_ops = &wilc_netdev_ops;
diff --git a/drivers/staging/wilc1000/wilc_wfi_netdevice.h b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
index 9a9e082..cb23134 100644
--- a/drivers/staging/wilc1000/wilc_wfi_netdevice.h
+++ b/drivers/staging/wilc1000/wilc_wfi_netdevice.h
@@ -199,7 +199,7 @@  typedef struct {
 	struct_frame_reg g_struct_frame_reg[num_reg_frame];
 	struct net_device *wilc_netdev;
 	struct net_device_stats netstats;
-
+	struct wilc *wilc;
 } perInterface_wlan_t;
 
 struct WILC_WFI_mon_priv {