aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2011-09-19 12:15:00 -0400
committerKalle Valo <kvalo@qca.qualcomm.com>2011-09-22 03:07:58 -0400
commitf195d5076a734c6d96a0dd80fe2a3b1e608e7979 (patch)
tree462b80904081175832a89c9e25fe7d13321131c9 /drivers
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')
-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 dbddb91389d0..24f0e3eb4211 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)
1185 return 0; 1185 return 0;
1186} 1186}
1187 1187
1188static int ath6kl_wmi_opt_frame_event_rx(struct wmi *wmi, u8 *datap, int len)
1189{
1190 struct bss *bss;
1191 struct wmi_opt_rx_info_hdr *bih;
1192 u8 *buf;
1193
1194 if (len <= sizeof(struct wmi_opt_rx_info_hdr))
1195 return -EINVAL;
1196
1197 bih = (struct wmi_opt_rx_info_hdr *) datap;
1198 buf = datap + sizeof(struct wmi_opt_rx_info_hdr);
1199 len -= sizeof(struct wmi_opt_rx_info_hdr);
1200
1201 ath6kl_dbg(ATH6KL_DBG_WMI, "opt frame event %2.2x:%2.2x\n",
1202 bih->bssid[4], bih->bssid[5]);
1203
1204 bss = wlan_find_node(&wmi->parent_dev->scan_table, bih->bssid);
1205 if (bss != NULL) {
1206 /* Free up the node. We are about to allocate a new node. */
1207 wlan_node_reclaim(&wmi->parent_dev->scan_table, bss);
1208 }
1209
1210 bss = wlan_node_alloc(len);
1211 if (!bss)
1212 return -ENOMEM;
1213
1214 bss->ni_snr = bih->snr;
1215 bss->ni_cie.ie_chan = le16_to_cpu(bih->ch);
1216
1217 if (WARN_ON(!bss->ni_buf))
1218 return -EINVAL;
1219
1220 memcpy(bss->ni_buf, buf, len);
1221 wlan_setup_node(&wmi->parent_dev->scan_table, bss, bih->bssid);
1222
1223 return 0;
1224}
1225
1226/* Inactivity timeout of a fatpipe(pstream) at the target */ 1188/* Inactivity timeout of a fatpipe(pstream) at the target */
1227static int ath6kl_wmi_pstream_timeout_event_rx(struct wmi *wmi, u8 *datap, 1189static int ath6kl_wmi_pstream_timeout_event_rx(struct wmi *wmi, u8 *datap,
1228 int len) 1190 int len)
@@ -3175,7 +3137,7 @@ int ath6kl_wmi_control_rx(struct wmi *wmi, struct sk_buff *skb)
3175 break; 3137 break;
3176 case WMI_OPT_RX_FRAME_EVENTID: 3138 case WMI_OPT_RX_FRAME_EVENTID:
3177 ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_OPT_RX_FRAME_EVENTID\n"); 3139 ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_OPT_RX_FRAME_EVENTID\n");
3178 ret = ath6kl_wmi_opt_frame_event_rx(wmi, datap, len); 3140 /* this event has been deprecated */
3179 break; 3141 break;
3180 case WMI_REPORT_ROAM_TBL_EVENTID: 3142 case WMI_REPORT_ROAM_TBL_EVENTID:
3181 ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_REPORT_ROAM_TBL_EVENTID\n"); 3143 ath6kl_dbg(ATH6KL_DBG_WMI, "WMI_REPORT_ROAM_TBL_EVENTID\n");