From: Glen Lee Date: Tue, 27 Oct 2015 09:28:01 +0000 (+0900) Subject: staging: wilc1000: mac_xmit: use netdev private wilc instead of g_linux_wlan X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b7495be52a25b7136aa437262a7e04d41d7afdde;p=linux-beck.git 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 Signed-off-by: Greg Kroah-Hartman --- 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;