summaryrefslogtreecommitdiff
path: root/drivers/staging/wilc1000
diff options
context:
space:
mode:
authorGlen Lee <glen.lee@atmel.com>2015-10-27 18:28:01 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-10-29 08:11:23 +0900
commitb7495be52a25b7136aa437262a7e04d41d7afdde (patch)
tree1bb79292c1ca243b24dfd24a8392c3120e538d79 /drivers/staging/wilc1000
parent50a0b3b7f5f8fd6a5e8163fbf6c436807085fd4a (diff)
staging: wilc1000: mac_xmit: use netdev private wilc instead of g_linux_wlan
This patch uses netdev private data member wilc instead of g_linux_wlan. Signed-off-by: Glen Lee <glen.lee@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
-rw-r--r--drivers/staging/wilc1000/linux_wlan.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/wilc1000/linux_wlan.c b/drivers/staging/wilc1000/linux_wlan.c
index d839f3b04a62..9a105cebc835 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;