aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/join.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas/join.c')
-rw-r--r--drivers/net/wireless/libertas/join.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 0edce849e4ad..8c578ec452e4 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -804,8 +804,8 @@ int libertas_ret_80211_associate(wlan_private * priv,
804 adapter->nextSNRNF = 0; 804 adapter->nextSNRNF = 0;
805 adapter->numSNRNF = 0; 805 adapter->numSNRNF = 0;
806 806
807 netif_carrier_on(priv->wlan_dev.netdev); 807 netif_carrier_on(priv->dev);
808 netif_wake_queue(priv->wlan_dev.netdev); 808 netif_wake_queue(priv->dev);
809 809
810 netif_carrier_on(priv->mesh_dev); 810 netif_carrier_on(priv->mesh_dev);
811 netif_wake_queue(priv->mesh_dev); 811 netif_wake_queue(priv->mesh_dev);
@@ -814,7 +814,7 @@ int libertas_ret_80211_associate(wlan_private * priv,
814 814
815 memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN); 815 memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN);
816 wrqu.ap_addr.sa_family = ARPHRD_ETHER; 816 wrqu.ap_addr.sa_family = ARPHRD_ETHER;
817 wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL); 817 wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
818 818
819done: 819done:
820 lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret); 820 lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
@@ -899,8 +899,8 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
899 memcpy(&adapter->curbssparams.ssid, 899 memcpy(&adapter->curbssparams.ssid,
900 &pbssdesc->ssid, sizeof(struct WLAN_802_11_SSID)); 900 &pbssdesc->ssid, sizeof(struct WLAN_802_11_SSID));
901 901
902 netif_carrier_on(priv->wlan_dev.netdev); 902 netif_carrier_on(priv->dev);
903 netif_wake_queue(priv->wlan_dev.netdev); 903 netif_wake_queue(priv->dev);
904 904
905 netif_carrier_on(priv->mesh_dev); 905 netif_carrier_on(priv->mesh_dev);
906 netif_wake_queue(priv->mesh_dev); 906 netif_wake_queue(priv->mesh_dev);
@@ -908,7 +908,7 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
908 memset(&wrqu, 0, sizeof(wrqu)); 908 memset(&wrqu, 0, sizeof(wrqu));
909 memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN); 909 memcpy(wrqu.ap_addr.sa_data, adapter->curbssparams.bssid, ETH_ALEN);
910 wrqu.ap_addr.sa_family = ARPHRD_ETHER; 910 wrqu.ap_addr.sa_family = ARPHRD_ETHER;
911 wireless_send_event(priv->wlan_dev.netdev, SIOCGIWAP, &wrqu, NULL); 911 wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
912 912
913 lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n"); 913 lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n");
914 lbs_deb_join("ADHOC_RESP: channel = %d\n", adapter->adhocchannel); 914 lbs_deb_join("ADHOC_RESP: channel = %d\n", adapter->adhocchannel);