DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nl80211: Use nl80211_cmd_msg() for P2P Device operations

Browse source 
bss->wdev_id_set is set for the non-detdev P2P Device, so
nl80211_cmd_msg() can be used as-is for these cases as well.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-12-06 16:09:39 +02:00
parent 9725b78421
commit a3249fdfb8
1 changed files with 5 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/drivers/driver_nl80211.c
View file

@ -2090,21 +2090,11 @@ static void wpa_driver_nl80211_send_rfkill(void *eloop_ctx, void *timeout_ctx)
static void nl80211_del_p2pdev(struct i802_bss *bss) static void nl80211_del_p2pdev(struct i802_bss *bss)
{ {
struct wpa_driver_nl80211_data *drv = bss->drv;
struct nl_msg *msg; struct nl_msg *msg;
int ret; int ret;
msg = nlmsg_alloc(); msg = nl80211_cmd_msg(bss, 0, NL80211_CMD_DEL_INTERFACE);
if (!msg) ret = send_and_recv_msgs(bss->drv, msg, NULL, NULL);
return;
if (!nl80211_cmd(drv, msg, 0, NL80211_CMD_DEL_INTERFACE) ||
nla_put_u64(msg, NL80211_ATTR_WDEV, bss->wdev_id)) {
nlmsg_free(msg);
return;
}
ret = send_and_recv_msgs(drv, msg, NULL, NULL);
wpa_printf(MSG_DEBUG, "nl80211: Delete P2P Device %s (0x%llx): %s", wpa_printf(MSG_DEBUG, "nl80211: Delete P2P Device %s (0x%llx): %s",
bss->ifname, (long long unsigned int) bss->wdev_id, bss->ifname, (long long unsigned int) bss->wdev_id,
@ -2114,22 +2104,12 @@ static void nl80211_del_p2pdev(struct i802_bss *bss)
static int nl80211_set_p2pdev(struct i802_bss *bss, int start) static int nl80211_set_p2pdev(struct i802_bss *bss, int start)
{ {
struct wpa_driver_nl80211_data *drv = bss->drv;
struct nl_msg *msg; struct nl_msg *msg;
int ret; int ret;
msg = nlmsg_alloc(); msg = nl80211_cmd_msg(bss, 0, start ? NL80211_CMD_START_P2P_DEVICE :
if (!msg) NL80211_CMD_STOP_P2P_DEVICE);
return -1; ret = send_and_recv_msgs(bss->drv, msg, NULL, NULL);
if (!nl80211_cmd(drv, msg, 0, start ? NL80211_CMD_START_P2P_DEVICE :
NL80211_CMD_STOP_P2P_DEVICE) ||
nla_put_u64(msg, NL80211_ATTR_WDEV, bss->wdev_id)) {
nlmsg_free(msg);
return -1;
}
ret = send_and_recv_msgs(drv, msg, NULL, NULL);
wpa_printf(MSG_DEBUG, "nl80211: %s P2P Device %s (0x%llx): %s", wpa_printf(MSG_DEBUG, "nl80211: %s P2P Device %s (0x%llx): %s",
start ? "Start" : "Stop", start ? "Start" : "Stop",