Skip to content

Commit

Permalink
ath6kl: Remove deprecated WMI_OPT_RX_FRAME_EVENTID processing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jouni Malinen authored and Kalle Valo committed Sep 22, 2011
1 parent 01cac47 commit f195d50
Showing 1 changed file with 1 addition and 39 deletions.
40 changes: 1 addition & 39 deletions drivers/net/wireless/ath/ath6kl/wmi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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");
Expand Down

0 comments on commit f195d50

Please sign in to comment.