lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwmc3200wifi: use cfg80211_connect_result to send req/resp IE

Browse Source 
cfg80211_connect_result() let us specify associate request and
response IEs as parameters after we are connected. We use this
capability instead of doing it ourselves with WEXT.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Zhu Yi
2009-07-20 11:47:45 +08:00
committed by John W. Linville
parent 3409ff7711
commit b68518fcbc
3 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/wireless/iwmc3200wifi/iwm.h
View File

@@ -281,6 +281,11 @@ struct iwm_priv {
struct work_struct reset_worker; struct work_struct reset_worker;
struct mutex mutex; struct mutex mutex;
u8 *req_ie;
int req_ie_len;
u8 *resp_ie;
int resp_ie_len;
char private[0] __attribute__((__aligned__(NETDEV_ALIGN))); char private[0] __attribute__((__aligned__(NETDEV_ALIGN)));
}; };

7
drivers/net/wireless/iwmc3200wifi/main.c
View File

@@ -497,6 +497,13 @@ void iwm_link_off(struct iwm_priv *iwm)
memset(wstats, 0, sizeof(struct iw_statistics)); memset(wstats, 0, sizeof(struct iw_statistics));
wstats->qual.updated = IW_QUAL_ALL_INVALID; wstats->qual.updated = IW_QUAL_ALL_INVALID;
kfree(iwm->req_ie);
iwm->req_ie = NULL;
iwm->req_ie_len = 0;
kfree(iwm->resp_ie);
iwm->resp_ie = NULL;
iwm->resp_ie_len = 0;
del_timer_sync(&iwm->watchdog); del_timer_sync(&iwm->watchdog);
} }

36
drivers/net/wireless/iwmc3200wifi/rx.c
View File

@@ -519,7 +519,8 @@ static int iwm_mlme_assoc_complete(struct iwm_priv *iwm, u8 *buf,
cfg80211_connect_result(iwm_to_ndev(iwm), cfg80211_connect_result(iwm_to_ndev(iwm),
complete->bssid, complete->bssid,
NULL, 0, NULL, 0, iwm->req_ie, iwm->req_ie_len,
iwm->resp_ie, iwm->resp_ie_len,
WLAN_STATUS_SUCCESS, GFP_KERNEL); WLAN_STATUS_SUCCESS, GFP_KERNEL);
break; break;
case UMAC_ASSOC_COMPLETE_FAILURE: case UMAC_ASSOC_COMPLETE_FAILURE:
@@ -771,37 +772,46 @@ static int iwm_mlme_mgt_frame(struct iwm_priv *iwm, u8 *buf,
unsigned long buf_size, struct iwm_wifi_cmd *cmd) unsigned long buf_size, struct iwm_wifi_cmd *cmd)
{ {
struct iwm_umac_notif_mgt_frame *mgt_frame = struct iwm_umac_notif_mgt_frame *mgt_frame =
(struct iwm_umac_notif_mgt_frame *)buf; (struct iwm_umac_notif_mgt_frame *)buf;
struct ieee80211_mgmt *mgt = (struct ieee80211_mgmt *)mgt_frame->frame; struct ieee80211_mgmt *mgt = (struct ieee80211_mgmt *)mgt_frame->frame;
u8 *ie; u8 *ie;
unsigned int event;
union iwreq_data wrqu;
IWM_HEXDUMP(iwm, DBG, MLME, "MGT: ", mgt_frame->frame, IWM_HEXDUMP(iwm, DBG, MLME, "MGT: ", mgt_frame->frame,
le16_to_cpu(mgt_frame->len)); le16_to_cpu(mgt_frame->len));
if (ieee80211_is_assoc_req(mgt->frame_control)) { if (ieee80211_is_assoc_req(mgt->frame_control)) {
ie = mgt->u.assoc_req.variable;; ie = mgt->u.assoc_req.variable;;
event = IWEVASSOCREQIE; iwm->req_ie_len =
le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt);
kfree(iwm->req_ie);
iwm->req_ie = kmemdup(mgt->u.assoc_req.variable,
iwm->req_ie_len, GFP_KERNEL);
} else if (ieee80211_is_reassoc_req(mgt->frame_control)) { } else if (ieee80211_is_reassoc_req(mgt->frame_control)) {
ie = mgt->u.reassoc_req.variable;; ie = mgt->u.reassoc_req.variable;;
event = IWEVASSOCREQIE; iwm->req_ie_len =
le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt);
kfree(iwm->req_ie);
iwm->req_ie = kmemdup(mgt->u.reassoc_req.variable,
iwm->req_ie_len, GFP_KERNEL);
} else if (ieee80211_is_assoc_resp(mgt->frame_control)) { } else if (ieee80211_is_assoc_resp(mgt->frame_control)) {
ie = mgt->u.assoc_resp.variable;; ie = mgt->u.assoc_resp.variable;;
event = IWEVASSOCRESPIE; iwm->resp_ie_len =
le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt);
kfree(iwm->resp_ie);
iwm->resp_ie = kmemdup(mgt->u.assoc_resp.variable,
iwm->resp_ie_len, GFP_KERNEL);
} else if (ieee80211_is_reassoc_resp(mgt->frame_control)) { } else if (ieee80211_is_reassoc_resp(mgt->frame_control)) {
ie = mgt->u.reassoc_resp.variable;; ie = mgt->u.reassoc_resp.variable;;
event = IWEVASSOCRESPIE; iwm->resp_ie_len =
le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt);
kfree(iwm->resp_ie);
iwm->resp_ie = kmemdup(mgt->u.reassoc_resp.variable,
iwm->resp_ie_len, GFP_KERNEL);
} else { } else {
IWM_ERR(iwm, "Unsupported management frame"); IWM_ERR(iwm, "Unsupported management frame");
return 0; return 0;
} }
wrqu.data.length = le16_to_cpu(mgt_frame->len) - (ie - (u8 *)mgt);
IWM_HEXDUMP(iwm, DBG, MLME, "EVT: ", ie, wrqu.data.length);
wireless_send_event(iwm_to_ndev(iwm), event, &wrqu, ie);
return 0; return 0;
} }