diff options
Diffstat (limited to 'drivers/net/wireless/libertas/cmdresp.c')
-rw-r--r-- | drivers/net/wireless/libertas/cmdresp.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c index 1efdc4beb7f0..45459d4ba684 100644 --- a/drivers/net/wireless/libertas/cmdresp.c +++ b/drivers/net/wireless/libertas/cmdresp.c | |||
@@ -42,15 +42,15 @@ void libertas_mac_event_disconnected(wlan_private * priv) | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | msleep_interruptible(1000); | 44 | msleep_interruptible(1000); |
45 | wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL); | 45 | wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL); |
46 | 46 | ||
47 | /* Free Tx and Rx packets */ | 47 | /* Free Tx and Rx packets */ |
48 | kfree_skb(priv->adapter->currenttxskb); | 48 | kfree_skb(priv->adapter->currenttxskb); |
49 | priv->adapter->currenttxskb = NULL; | 49 | priv->adapter->currenttxskb = NULL; |
50 | 50 | ||
51 | /* report disconnect to upper layer */ | 51 | /* report disconnect to upper layer */ |
52 | netif_stop_queue(priv->wlan_dev.netdev); | 52 | netif_stop_queue(priv->dev); |
53 | netif_carrier_off(priv->wlan_dev.netdev); | 53 | netif_carrier_off(priv->dev); |
54 | 54 | ||
55 | /* reset SNR/NF/RSSI values */ | 55 | /* reset SNR/NF/RSSI values */ |
56 | memset(adapter->SNR, 0x00, sizeof(adapter->SNR)); | 56 | memset(adapter->SNR, 0x00, sizeof(adapter->SNR)); |
@@ -218,7 +218,7 @@ static int wlan_ret_get_hw_spec(wlan_private * priv, | |||
218 | ETH_ALEN); | 218 | ETH_ALEN); |
219 | } | 219 | } |
220 | 220 | ||
221 | memcpy(priv->wlan_dev.netdev->dev_addr, adapter->current_addr, ETH_ALEN); | 221 | memcpy(priv->dev->dev_addr, adapter->current_addr, ETH_ALEN); |
222 | if (priv->mesh_dev) | 222 | if (priv->mesh_dev) |
223 | memcpy(priv->mesh_dev->dev_addr, adapter->current_addr, | 223 | memcpy(priv->mesh_dev->dev_addr, adapter->current_addr, |
224 | ETH_ALEN); | 224 | ETH_ALEN); |
@@ -774,14 +774,14 @@ int libertas_process_rx_command(wlan_private * priv) | |||
774 | resp = (struct cmd_ds_command *)(adapter->cur_cmd->bufvirtualaddr); | 774 | resp = (struct cmd_ds_command *)(adapter->cur_cmd->bufvirtualaddr); |
775 | 775 | ||
776 | lbs_dbg_hex("CMD_RESP:", adapter->cur_cmd->bufvirtualaddr, | 776 | lbs_dbg_hex("CMD_RESP:", adapter->cur_cmd->bufvirtualaddr, |
777 | priv->wlan_dev.upld_len); | 777 | priv->upld_len); |
778 | 778 | ||
779 | respcmd = le16_to_cpu(resp->command); | 779 | respcmd = le16_to_cpu(resp->command); |
780 | 780 | ||
781 | result = le16_to_cpu(resp->result); | 781 | result = le16_to_cpu(resp->result); |
782 | 782 | ||
783 | lbs_deb_cmd("CMD_RESP: %x result: %d length: %d\n", respcmd, | 783 | lbs_deb_cmd("CMD_RESP: %x result: %d length: %d\n", respcmd, |
784 | result, priv->wlan_dev.upld_len); | 784 | result, priv->upld_len); |
785 | 785 | ||
786 | if (!(respcmd & 0x8000)) { | 786 | if (!(respcmd & 0x8000)) { |
787 | lbs_deb_cmd("Invalid response to command!"); | 787 | lbs_deb_cmd("Invalid response to command!"); |