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

nl80211: use P2P interface types

Browse source 
We can use the P2P interface types to check if the driver supports P2P
and to tell the kernel that a given interface is going to be used for
P2P (when it is created).

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2011-01-31 21:49:48 +02:00 committed by Jouni Malinen
parent 6c714cd7d4
commit 9f51b11395
1 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/drivers/driver_nl80211.c
View file

@ -1472,6 +1472,7 @@ nla_put_failure:
struct wiphy_info_data { struct wiphy_info_data {
int max_scan_ssids; int max_scan_ssids;
int ap_supported; int ap_supported;
int p2p_supported;
int auth_supported; int auth_supported;
int connect_supported; int connect_supported;
int offchan_tx_supported; int offchan_tx_supported;
@ -1483,6 +1484,7 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
struct nlattr *tb[NL80211_ATTR_MAX + 1]; struct nlattr *tb[NL80211_ATTR_MAX + 1];
struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg)); struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
struct wiphy_info_data *info = arg; struct wiphy_info_data *info = arg;
int p2p_go_supported = 0, p2p_client_supported = 0;
nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0), nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
genlmsg_attrlen(gnlh, 0), NULL); genlmsg_attrlen(gnlh, 0), NULL);
@ -1496,13 +1498,22 @@ static int wiphy_info_handler(struct nl_msg *msg, void *arg)
int i; int i;
nla_for_each_nested(nl_mode, nla_for_each_nested(nl_mode,
tb[NL80211_ATTR_SUPPORTED_IFTYPES], i) { tb[NL80211_ATTR_SUPPORTED_IFTYPES], i) {
if (nl_mode->nla_type == NL80211_IFTYPE_AP) { switch (nl_mode->nla_type) {
case NL80211_IFTYPE_AP:
info->ap_supported = 1; info->ap_supported = 1;
break; break;
case NL80211_IFTYPE_P2P_GO:
p2p_go_supported = 1;
break;
case NL80211_IFTYPE_P2P_CLIENT:
p2p_client_supported = 1;
break;
} }
} }
} }
info->p2p_supported = p2p_go_supported && p2p_client_supported;
if (tb[NL80211_ATTR_SUPPORTED_COMMANDS]) { if (tb[NL80211_ATTR_SUPPORTED_COMMANDS]) {
struct nlattr *nl_cmd; struct nlattr *nl_cmd;
int i; int i;
@ -1587,7 +1598,8 @@ static int wpa_driver_nl80211_capa(struct wpa_driver_nl80211_data *drv)
drv->capa.flags |= WPA_DRIVER_FLAGS_SANE_ERROR_CODES; drv->capa.flags |= WPA_DRIVER_FLAGS_SANE_ERROR_CODES;
drv->capa.flags |= WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC_DONE; drv->capa.flags |= WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC_DONE;
drv->capa.flags |= WPA_DRIVER_FLAGS_P2P_CAPABLE; if (info.p2p_supported)
drv->capa.flags |= WPA_DRIVER_FLAGS_P2P_CAPABLE;
drv->capa.max_remain_on_chan = 5000; drv->capa.max_remain_on_chan = 5000;
return 0; return 0;
@ -5663,14 +5675,16 @@ static enum nl80211_iftype wpa_driver_nl80211_if_type(
{ {
switch (type) { switch (type) {
case WPA_IF_STATION: case WPA_IF_STATION:
return NL80211_IFTYPE_STATION;
case WPA_IF_P2P_CLIENT: case WPA_IF_P2P_CLIENT:
case WPA_IF_P2P_GROUP: case WPA_IF_P2P_GROUP:
return NL80211_IFTYPE_STATION; return NL80211_IFTYPE_P2P_CLIENT;
case WPA_IF_AP_VLAN: case WPA_IF_AP_VLAN:
return NL80211_IFTYPE_AP_VLAN; return NL80211_IFTYPE_AP_VLAN;
case WPA_IF_AP_BSS: case WPA_IF_AP_BSS:
case WPA_IF_P2P_GO:
return NL80211_IFTYPE_AP; return NL80211_IFTYPE_AP;
case WPA_IF_P2P_GO:
return NL80211_IFTYPE_P2P_GO;
} }
return -1; return -1;
} }