diff mbox

[V2,25/27] staging: wilc1000: mac_xmit: use netdev private wilc instead of g_linux_wlan

Message ID 1445938083-20445-25-git-send-email-glen.lee@atmel.com (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Glen Lee Oct. 27, 2015, 9:28 a.m. UTC 
This patch uses netdev private data member wilc instead of g_linux_wlan.

Signed-off-by: Glen Lee <glen.lee@atmel.com>
---
 drivers/staging/wilc1000/linux_wlan.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index d839f3b..9a105ceb 100644
--- a/drivers/staging/wilc1000/linux_wlan.c
+++ b/drivers/staging/wilc1000/linux_wlan.c
@@ -1366,8 +1366,10 @@  int mac_xmit(struct sk_buff *skb, struct net_device *ndev)
 	char *pu8UdpBuffer;
 	struct iphdr *ih;
 	struct ethhdr *eth_h;
+	struct wilc *wilc;
 
 	nic = netdev_priv(ndev);
+	wilc = nic->wilc;
 
 	PRINT_D(TX_DBG, "Sending packet just received from TCP/IP\n");
 
@@ -1410,14 +1412,14 @@  int mac_xmit(struct sk_buff *skb, struct net_device *ndev)
 	PRINT_D(TX_DBG, "Adding tx packet to TX Queue\n");
 	nic->netstats.tx_packets++;
 	nic->netstats.tx_bytes += tx_data->size;
-	tx_data->pBssid = g_linux_wlan->vif[nic->u8IfIdx].bssid;
+	tx_data->pBssid = wilc->vif[nic->u8IfIdx].bssid;
 	QueueCount = wilc_wlan_txq_add_net_pkt((void *)tx_data, tx_data->buff,
 					       tx_data->size,
 					       linux_wlan_tx_complete);
 
 	if (QueueCount > FLOW_CONTROL_UPPER_THRESHOLD) {
-		netif_stop_queue(g_linux_wlan->vif[0].ndev);
-		netif_stop_queue(g_linux_wlan->vif[1].ndev);
+		netif_stop_queue(wilc->vif[0].ndev);
+		netif_stop_queue(wilc->vif[1].ndev);
 	}
 
 	return 0;