diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2013-03-29 16:41:28 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2013-03-29 16:41:28 -0700 |
| commit | 0ccb66edb8d2a0a397320ace3ec2a03fb0d00d5f (patch) | |
| tree | b61b6c4165a796ea67fc5cee81b09b8b2a623306 /src/ap | |
| parent | 37d4d6a4efea4ef4f864347ac8ed8d62a9e19f90 (diff) | |
| download | android_external_wpa_supplicant_8-0ccb66edb8d2a0a397320ace3ec2a03fb0d00d5f.tar.gz android_external_wpa_supplicant_8-0ccb66edb8d2a0a397320ace3ec2a03fb0d00d5f.tar.bz2 android_external_wpa_supplicant_8-0ccb66edb8d2a0a397320ace3ec2a03fb0d00d5f.zip | |
Accumulative patch from commit ce26864e79144cba12d5ff98632570593cc57b8a
187f87f hostapd: Allow ctrl_iface group to be specified on command line
9f890c9 TDLS: Support both external and internal setup in disabling link
864fe3a TDLS: Fix TDLS Setup Request processing in existing-peer cases
1d43e28 TDLS: Fix TPK M2 processing in concurrent initiation case
ef8151a P2P: Write p2p_ignore_shared_freq to configuration file on updates
8047f70 P2P: Ignore Tx acknowledgment status for Invitation Response
18a2eaa Add ap_vendor_elements for wpa_supplicant AP/P2P GO mode
b084df8 Add vendor_elements into Beacon/Probe Response IE parameters
b92e08f nl80211: Add debug prints for set_ap parameters
c30a4ab nl80211: Fix mode settings with split wiphy dump
Change-Id: I859638e630b6ca32b64e09943fce4d96f779897b
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/ap')
| -rw-r--r-- | src/ap/ap_drv_ops.c | 8 | ||||
| -rw-r--r-- | src/ap/hostapd.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ap/ap_drv_ops.c b/src/ap/ap_drv_ops.c index b71d51d8..8205d132 100644 --- a/src/ap/ap_drv_ops.c +++ b/src/ap/ap_drv_ops.c @@ -173,6 +173,14 @@ int hostapd_build_ap_extra_ies(struct hostapd_data *hapd, } #endif /* CONFIG_HS20 */ + if (hapd->conf->vendor_elements) { + size_t add = wpabuf_len(hapd->conf->vendor_elements); + if (wpabuf_resize(&beacon, add) == 0) + wpabuf_put_buf(beacon, hapd->conf->vendor_elements); + if (wpabuf_resize(&proberesp, add) == 0) + wpabuf_put_buf(proberesp, hapd->conf->vendor_elements); + } + *beacon_ret = beacon; *proberesp_ret = proberesp; *assocresp_ret = assocresp; diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h index 8ab4f3e0..f5aed994 100644 --- a/src/ap/hostapd.h +++ b/src/ap/hostapd.h @@ -40,6 +40,7 @@ struct hapd_interfaces { int global_ctrl_sock; char *global_iface_path; char *global_iface_name; + gid_t ctrl_iface_group; struct hostapd_iface **iface; }; |