diff options
author | Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com> | 2011-10-25 10:04:14 -0400 |
---|---|---|
committer | Kalle Valo <kvalo@qca.qualcomm.com> | 2011-11-11 05:58:48 -0500 |
commit | 28ae58dd1f55f55dabf02fbc76a76f0809eee937 (patch) | |
tree | 91b07188914a8ecfa2d1eb0eacb1ae11e7e7e953 /drivers/net/wireless/ath/ath6kl/main.c | |
parent | 240d279940ef496e9456db2287b7989f6521e2e2 (diff) |
ath6kl: Remove net_device from ath6kl
Use one which is available in vif structure instead.
Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/main.c')
-rw-r--r-- | drivers/net/wireless/ath/ath6kl/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c index 19b64ae08e12..023624d9f017 100644 --- a/drivers/net/wireless/ath/ath6kl/main.c +++ b/drivers/net/wireless/ath/ath6kl/main.c | |||
@@ -938,7 +938,7 @@ void ath6kl_deep_sleep_enable(struct ath6kl *ar) | |||
938 | 938 | ||
939 | switch (vif->sme_state) { | 939 | switch (vif->sme_state) { |
940 | case SME_CONNECTING: | 940 | case SME_CONNECTING: |
941 | cfg80211_connect_result(ar->net_dev, vif->bssid, NULL, 0, | 941 | cfg80211_connect_result(vif->ndev, vif->bssid, NULL, 0, |
942 | NULL, 0, | 942 | NULL, 0, |
943 | WLAN_STATUS_UNSPECIFIED_FAILURE, | 943 | WLAN_STATUS_UNSPECIFIED_FAILURE, |
944 | GFP_KERNEL); | 944 | GFP_KERNEL); |
@@ -950,7 +950,7 @@ void ath6kl_deep_sleep_enable(struct ath6kl *ar) | |||
950 | * suspend, why? Need to send disconnected event in that | 950 | * suspend, why? Need to send disconnected event in that |
951 | * state. | 951 | * state. |
952 | */ | 952 | */ |
953 | cfg80211_disconnected(ar->net_dev, 0, NULL, 0, GFP_KERNEL); | 953 | cfg80211_disconnected(vif->ndev, 0, NULL, 0, GFP_KERNEL); |
954 | break; | 954 | break; |
955 | } | 955 | } |
956 | 956 | ||
@@ -995,7 +995,7 @@ static const char *get_hw_id_string(u32 id) | |||
995 | void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver) | 995 | void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver) |
996 | { | 996 | { |
997 | struct ath6kl *ar = devt; | 997 | struct ath6kl *ar = devt; |
998 | struct net_device *dev = ar->net_dev; | 998 | struct net_device *dev = ar->vif->ndev; |
999 | 999 | ||
1000 | memcpy(dev->dev_addr, datap, ETH_ALEN); | 1000 | memcpy(dev->dev_addr, datap, ETH_ALEN); |
1001 | ath6kl_dbg(ATH6KL_DBG_TRC, "%s: mac addr = %pM\n", | 1001 | ath6kl_dbg(ATH6KL_DBG_TRC, "%s: mac addr = %pM\n", |