main.c (240d279940ef496e9456db2287b7989f6521e2e2) main.c (28ae58dd1f55f55dabf02fbc76a76f0809eee937)
1/*
2 * Copyright (c) 2004-2011 Atheros Communications Inc.
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

--- 924 unchanged lines hidden (view full) ---

933
934void ath6kl_deep_sleep_enable(struct ath6kl *ar)
935{
936 /* TODO: Pass vif instead of taking it from ar */
937 struct ath6kl_vif *vif = ar->vif;
938
939 switch (vif->sme_state) {
940 case SME_CONNECTING:
1/*
2 * Copyright (c) 2004-2011 Atheros Communications Inc.
3 *
4 * Permission to use, copy, modify, and/or distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

--- 924 unchanged lines hidden (view full) ---

933
934void ath6kl_deep_sleep_enable(struct ath6kl *ar)
935{
936 /* TODO: Pass vif instead of taking it from ar */
937 struct ath6kl_vif *vif = ar->vif;
938
939 switch (vif->sme_state) {
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,
943 WLAN_STATUS_UNSPECIFIED_FAILURE,
944 GFP_KERNEL);
945 break;
946 case SME_CONNECTED:
947 default:
948 /*
949 * FIXME: oddly enough smeState is in DISCONNECTED during
950 * suspend, why? Need to send disconnected event in that
951 * state.
952 */
942 NULL, 0,
943 WLAN_STATUS_UNSPECIFIED_FAILURE,
944 GFP_KERNEL);
945 break;
946 case SME_CONNECTED:
947 default:
948 /*
949 * FIXME: oddly enough smeState is in DISCONNECTED during
950 * suspend, why? Need to send disconnected event in that
951 * state.
952 */
953 cfg80211_disconnected(ar->net_dev, 0, NULL, 0, GFP_KERNEL);
953 cfg80211_disconnected(vif->ndev, 0, NULL, 0, GFP_KERNEL);
954 break;
955 }
956
957 if (test_bit(CONNECTED, &vif->flags) ||
958 test_bit(CONNECT_PEND, &vif->flags))
959 ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx);
960
961 vif->sme_state = SME_DISCONNECTED;

--- 28 unchanged lines hidden (view full) ---

990 default:
991 return "unknown";
992 }
993}
994
995void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver)
996{
997 struct ath6kl *ar = devt;
954 break;
955 }
956
957 if (test_bit(CONNECTED, &vif->flags) ||
958 test_bit(CONNECT_PEND, &vif->flags))
959 ath6kl_wmi_disconnect_cmd(ar->wmi, vif->fw_vif_idx);
960
961 vif->sme_state = SME_DISCONNECTED;

--- 28 unchanged lines hidden (view full) ---

990 default:
991 return "unknown";
992 }
993}
994
995void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver)
996{
997 struct ath6kl *ar = devt;
998 struct net_device *dev = ar->net_dev;
998 struct net_device *dev = ar->vif->ndev;
999
1000 memcpy(dev->dev_addr, datap, ETH_ALEN);
1001 ath6kl_dbg(ATH6KL_DBG_TRC, "%s: mac addr = %pM\n",
1002 __func__, dev->dev_addr);
1003
1004 ar->version.wlan_ver = sw_ver;
1005 ar->version.abi_ver = abi_ver;
1006

--- 500 unchanged lines hidden ---
999
1000 memcpy(dev->dev_addr, datap, ETH_ALEN);
1001 ath6kl_dbg(ATH6KL_DBG_TRC, "%s: mac addr = %pM\n",
1002 __func__, dev->dev_addr);
1003
1004 ar->version.wlan_ver = sw_ver;
1005 ar->version.abi_ver = abi_ver;
1006

--- 500 unchanged lines hidden ---