summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ath
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2011-09-19 19:15:00 +0300
committerKalle Valo <kvalo@qca.qualcomm.com>2011-09-22 10:07:58 +0300
commitf195d5076a734c6d96a0dd80fe2a3b1e608e7979 (patch)
tree462b80904081175832a89c9e25fe7d13321131c9 /drivers/net/wireless/ath
parent01cac476a4bb07b5b6f205b15809e0a845574653 (diff)
ath6kl: Remove deprecated WMI_OPT_RX_FRAME_EVENTID processing
This event has been deprecated and there is no need for ath6kl to include code for processing it. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Diffstat (limited to 'drivers/net/wireless/ath')
-rw-r--r--drivers/net/wireless/ath/ath6kl/wmi.c40
1 files changed, 1 insertions, 39 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/wmi.c b/drivers/net/wireless/ath/ath6kl/wmi.c
index dbddb91389d..24f0e3eb421 100644
--- a/drivers/net/wireless/ath/ath6kl/wmi.c
+++ b/drivers/net/wireless/ath/ath6kl/wmi.c
@@ -1185,44 +1185,6 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len)
return 0;
}
-static int ath6kl_wmi_opt_frame_event_rx(struct wmi *wmi, u8 *datap, int len)
-{
- struct bss *bss;
- struct wmi_opt_rx_info_hdr *bih;
- u8 *buf;
-
- if (len <= sizeof(struct wmi_opt_rx_info_hdr))
- return -EINVAL;
-
- bih = (struct wmi_opt_rx_info_hdr *) datap;
- buf = datap + sizeof(struct wmi_opt_rx_info_hdr);
- len -= sizeof(struct wmi_opt_rx_info_hdr);
-
- ath6kl_dbg(ATH6KL_DBG_WMI, "opt frame event %2.2x:%2.2x\n",
- bih->bssid[4], bih->bssid[5]);
-
- bss = wlan_find_node(&wmi->parent_dev->scan_table, bih->bssid);
- if (bss != NULL) {
- /* Free up the node. We are about to allocate a new node. */
- wlan_node_reclaim(&wmi->parent_dev->scan_table, bss);
- }
-
- bss = wlan_node_alloc(len);
- if (!bss)
- return -ENOMEM;
-
- bss->ni_snr = bih->snr;
- bss->ni_cie.ie_chan = le16_to_cpu(bih->ch);
-
- if (WARN_ON(!bss->ni_buf))
- return -EINVAL;
-
- memcpy(bss->ni_buf, buf, len);
- wlan_setup_node(&wmi->parent_dev->scan_table, bss, bih->bssid);
-
- return 0;
-}
-
/* Inactivity timeout of a fatpipe(pstream) at the target */
static int ath6kl_wmi_pstream_timeout_event_rx(struct wmi *wmi, u8 *datap,
int len)
@@ -3175,7 +3137,7 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)
break;
case WMI_OPT_RX_FRAME_EVENTID:
ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_OPT_RX_FRAME_EVENTID\n");
- ret = ath6kl_wmi_opt_frame_event_rx(wmi, datap, len);
+ /* this event has been deprecated */
break;
case WMI_REPORT_ROAM_TBL_EVENTID:
ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_REPORT_ROAM_TBL_EVENTID\n");