jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

test: Fix driver data pointer for the P2P commands

Browse source 
The driver_test.c data structures had been changed to use a separate
BSS structure, but the P2P commands were not using the new design.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2012-08-24 20:44:24 +03:00 committed by Jouni Malinen
parent 1c79cdff20
commit 1e05192eec
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/drivers/driver_test.c
View file

@ -2820,7 +2820,8 @@ static int wpa_driver_test_probe_req_report(void *priv, int report)
static int wpa_driver_test_p2p_find(void *priv, unsigned int timeout, int type) static int wpa_driver_test_p2p_find(void *priv, unsigned int timeout, int type)
{ {
struct wpa_driver_test_data *drv = priv; struct test_driver_bss *dbss = priv;
struct wpa_driver_test_data *drv = dbss->drv;
wpa_printf(MSG_DEBUG, "%s(timeout=%u)", __func__, timeout); wpa_printf(MSG_DEBUG, "%s(timeout=%u)", __func__, timeout);
if (!drv->p2p) if (!drv->p2p)
return -1; return -1;
@ -2830,7 +2831,8 @@ static int wpa_driver_test_p2p_find(void *priv, unsigned int timeout, int type)
static int wpa_driver_test_p2p_stop_find(void *priv) static int wpa_driver_test_p2p_stop_find(void *priv)
{ {
struct wpa_driver_test_data *drv = priv; struct test_driver_bss *dbss = priv;
struct wpa_driver_test_data *drv = dbss->drv;
wpa_printf(MSG_DEBUG, "%s", __func__); wpa_printf(MSG_DEBUG, "%s", __func__);
if (!drv->p2p) if (!drv->p2p)
return -1; return -1;
@ -2841,7 +2843,8 @@ static int wpa_driver_test_p2p_stop_find(void *priv)
static int wpa_driver_test_p2p_listen(void *priv, unsigned int timeout) static int wpa_driver_test_p2p_listen(void *priv, unsigned int timeout)
{ {
struct wpa_driver_test_data *drv = priv; struct test_driver_bss *dbss = priv;
struct wpa_driver_test_data *drv = dbss->drv;
wpa_printf(MSG_DEBUG, "%s(timeout=%u)", __func__, timeout); wpa_printf(MSG_DEBUG, "%s(timeout=%u)", __func__, timeout);
if (!drv->p2p) if (!drv->p2p)
return -1; return -1;
@ -2855,7 +2858,8 @@ static int wpa_driver_test_p2p_connect(void *priv, const u8 *peer_addr,
unsigned int force_freq, unsigned int force_freq,
int persistent_group) int persistent_group)
{ {
struct wpa_driver_test_data *drv = priv; struct test_driver_bss *dbss = priv;
struct wpa_driver_test_data *drv = dbss->drv;
wpa_printf(MSG_DEBUG, "%s(peer_addr=" MACSTR " wps_method=%d " wpa_printf(MSG_DEBUG, "%s(peer_addr=" MACSTR " wps_method=%d "
"go_intent=%d " "go_intent=%d "
"own_interface_addr=" MACSTR " force_freq=%u " "own_interface_addr=" MACSTR " force_freq=%u "
@ -2872,7 +2876,8 @@ static int wpa_driver_test_p2p_connect(void *priv, const u8 *peer_addr,
static int wpa_driver_test_wps_success_cb(void *priv, const u8 *peer_addr) static int wpa_driver_test_wps_success_cb(void *priv, const u8 *peer_addr)
{ {
struct wpa_driver_test_data *drv = priv; struct test_driver_bss *dbss = priv;
struct wpa_driver_test_data *drv = dbss->drv;
wpa_printf(MSG_DEBUG, "%s(peer_addr=" MACSTR ")", wpa_printf(MSG_DEBUG, "%s(peer_addr=" MACSTR ")",
__func__, MAC2STR(peer_addr)); __func__, MAC2STR(peer_addr));
if (!drv->p2p) if (!drv->p2p)
@ -2884,7 +2889,8 @@ static int wpa_driver_test_wps_success_cb(void *priv, const u8 *peer_addr)
static int wpa_driver_test_p2p_group_formation_failed(void *priv) static int wpa_driver_test_p2p_group_formation_failed(void *priv)
{ {
struct wpa_driver_test_data *drv = priv; struct test_driver_bss *dbss = priv;
struct wpa_driver_test_data *drv = dbss->drv;
wpa_printf(MSG_DEBUG, "%s", __func__); wpa_printf(MSG_DEBUG, "%s", __func__);
if (!drv->p2p) if (!drv->p2p)
return -1; return -1;
@ -2896,7 +2902,8 @@ static int wpa_driver_test_p2p_group_formation_failed(void *priv)
static int wpa_driver_test_p2p_set_params(void *priv, static int wpa_driver_test_p2p_set_params(void *priv,
const struct p2p_params *params) const struct p2p_params *params)
{ {
struct wpa_driver_test_data *drv = priv; struct test_driver_bss *dbss = priv;
struct wpa_driver_test_data *drv = dbss->drv;
wpa_printf(MSG_DEBUG, "%s", __func__); wpa_printf(MSG_DEBUG, "%s", __func__);
if (!drv->p2p) if (!drv->p2p)
return -1; return -1;