aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <j@w1.fi>2008-10-29 19:33:46 (GMT)
committerJouni Malinen <j@w1.fi>2008-10-29 19:33:46 (GMT)
commit3d536eb45382d8289fbbf62209023c793a3b579c (patch)
tree0d25266bffcfe6f083929ac1b27a6d1129090108
parentfefee8a74d4ce8dbf7ec55e082d0f70c5259ed70 (diff)
downloadhostap-06-3d536eb45382d8289fbbf62209023c793a3b579c.zip
hostap-06-3d536eb45382d8289fbbf62209023c793a3b579c.tar.gz
hostap-06-3d536eb45382d8289fbbf62209023c793a3b579c.tar.bz2
Removed the unused hapd argument to ieee802_11_parse_elems()
-rw-r--r--hostapd/beacon.c3
-rw-r--r--hostapd/driver_prism54.c2
-rw-r--r--hostapd/ieee802_11.c14
-rw-r--r--hostapd/ieee802_11.h3
-rw-r--r--hostapd/wme.c3
5 files changed, 10 insertions, 15 deletions
diff --git a/hostapd/beacon.c b/hostapd/beacon.c
index 4078607..b1332b6 100644
--- a/hostapd/beacon.c
+++ b/hostapd/beacon.c
@@ -189,8 +189,7 @@ void handle_probe_req(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
if (!hapd->iconf->send_probe_response)
return;
- if (ieee802_11_parse_elems(hapd, ie, ie_len, &elems, 0) == ParseFailed)
- {
+ if (ieee802_11_parse_elems(ie, ie_len, &elems, 0) == ParseFailed) {
wpa_printf(MSG_DEBUG, "Could not parse ProbeReq from " MACSTR,
MAC2STR(mgmt->sa));
return;
diff --git a/hostapd/driver_prism54.c b/hostapd/driver_prism54.c
index f119875..76bfcd2 100644
--- a/hostapd/driver_prism54.c
+++ b/hostapd/driver_prism54.c
@@ -757,7 +757,7 @@ static void prism54_handle_assoc(struct prism54_driver_data *drv,
resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
goto fail;
}
- if (ieee802_11_parse_elems(drv->hapd, cb + ieofs,
+ if (ieee802_11_parse_elems(cb + ieofs,
le_to_host16(mlme->size) - ieofs,
&elems, 1) == ParseFailed) {
printf("STA " MACSTR " sent invalid association "
diff --git a/hostapd/ieee802_11.c b/hostapd/ieee802_11.c
index e0a7d0e..81f7bae 100644
--- a/hostapd/ieee802_11.c
+++ b/hostapd/ieee802_11.c
@@ -293,8 +293,7 @@ u16 hostapd_own_capab_info(struct hostapd_data *hapd, struct sta_info *sta,
#define OUI_MICROSOFT 0x0050f2 /* Microsoft (also used in Wi-Fi specs)
* 00:50:F2 */
-static int ieee802_11_parse_vendor_specific(struct hostapd_data *hapd,
- u8 *pos, size_t elen,
+static int ieee802_11_parse_vendor_specific(u8 *pos, size_t elen,
struct ieee802_11_elems *elems,
int show_errors)
{
@@ -390,8 +389,7 @@ static u8 * hostapd_eid_assoc_comeback_time(struct hostapd_data *hapd,
#endif /* CONFIG_IEEE80211W */
-ParseRes ieee802_11_parse_elems(struct hostapd_data *hapd, u8 *start,
- size_t len,
+ParseRes ieee802_11_parse_elems(u8 *start, size_t len,
struct ieee802_11_elems *elems,
int show_errors)
{
@@ -461,7 +459,7 @@ ParseRes ieee802_11_parse_elems(struct hostapd_data *hapd, u8 *start,
elems->ext_supp_rates_len = elen;
break;
case WLAN_EID_VENDOR_SPECIFIC:
- if (ieee802_11_parse_vendor_specific(hapd, pos, elen,
+ if (ieee802_11_parse_vendor_specific(pos, elen,
elems,
show_errors))
unknown++;
@@ -1028,8 +1026,8 @@ static void handle_assoc(struct hostapd_data *hapd,
/* followed by SSID and Supported rates; and HT capabilities if 802.11n
* is used */
- if (ieee802_11_parse_elems(hapd, pos, left, &elems, 1) == ParseFailed
- || !elems.ssid) {
+ if (ieee802_11_parse_elems(pos, left, &elems, 1) == ParseFailed ||
+ !elems.ssid) {
printf("STA " MACSTR " sent invalid association request\n",
MAC2STR(sta->addr));
resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
@@ -1561,7 +1559,7 @@ static void handle_beacon(struct hostapd_data *hapd,
return;
}
- (void) ieee802_11_parse_elems(hapd, mgmt->u.beacon.variable,
+ (void) ieee802_11_parse_elems(mgmt->u.beacon.variable,
len - (IEEE80211_HDRLEN +
sizeof(mgmt->u.beacon)), &elems,
0);
diff --git a/hostapd/ieee802_11.h b/hostapd/ieee802_11.h
index 8df0a8b..5454812 100644
--- a/hostapd/ieee802_11.h
+++ b/hostapd/ieee802_11.h
@@ -83,8 +83,7 @@ void ieee802_11_mgmt(struct hostapd_data *hapd, u8 *buf, size_t len,
u16 stype, struct hostapd_frame_info *fi);
void ieee802_11_mgmt_cb(struct hostapd_data *hapd, u8 *buf, size_t len,
u16 stype, int ok);
-ParseRes ieee802_11_parse_elems(struct hostapd_data *hapd, u8 *start,
- size_t len,
+ParseRes ieee802_11_parse_elems(u8 *start, size_t len,
struct ieee802_11_elems *elems,
int show_errors);
void ieee802_11_print_ssid(char *buf, const u8 *ssid, u8 len);
diff --git a/hostapd/wme.c b/hostapd/wme.c
index 3195ddf..727ee7e 100644
--- a/hostapd/wme.c
+++ b/hostapd/wme.c
@@ -212,8 +212,7 @@ void hostapd_wme_action(struct hostapd_data *hapd, struct ieee80211_mgmt *mgmt,
}
/* extract the tspec info element */
- if (ieee802_11_parse_elems(hapd, pos, left, &elems, 1) == ParseFailed)
- {
+ if (ieee802_11_parse_elems(pos, left, &elems, 1) == ParseFailed) {
hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
HOSTAPD_LEVEL_DEBUG,
"hostapd_wme_action - could not parse wme "