| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
wpa_supplicant/wpa_supplicant_template.conf
Change-Id: Ifb38077650e8bb6075a17b8f2232f14b704281f1
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Commit "P2P: Fix duplicate handling of rx action frames"
went too far and dropped any rx action frames arriving on the GO
interface. It assumed that any action frames were duplicated
and received on both GO interface and P2P device interface.
This is wrong as some actions frames like P2P presence request
are sent to the GO interface address and won't be duplicated.
The root cause of the duplication lies within the Rx path in mac80211
in Johannes` patch "mac80211: accept public action frames with mismatched BSSID".
When wpa_s works with a separate group interface this creates a duplicated Rx
on both the P2P dev interface and the GO interface.
Fix the issue by canceling the duplication in wpa_s and discarding
public action frames with unmatching bssid arriving on a dedicated GO interface
(This should be squashed with
"P2P: Fix duplicate handling of rx action frames")
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| | |
Clear any previous pending timeouts before scheduling
a new delayed sched scan.
Signed-off-by: Victor Goldenshtein <victorg@ti.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The channel list can be changed as a result of arriving
beacon hints during normal scan or as a result of local
Reg-Domain change, some passive channels can become
active and shall be reconfigured accordingly for the
scheduled scan.
This fixes the connection to hidden SSIDs on 5Ghz band
during default Reg-Domain 00 (world roaming).
Signed-off-by: Victor Goldenshtein <victorg@ti.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Current sched scan in the kernel is limited to SSID matching.
A rare corner case is when an AP with a matching SSID but unmatching
security to a saved profile is in the vicinity. In such a case
sched scan results will immediately be returned after initiating sched
scan however no match will be found due to the security mismatch.
This goes on in a tight loop which is bad as it will effectively
prevent the host from suspending and scan results will eventually
contain the single AP matched by the sched scan due to expiration
of other APs scanned in normal scans which are less frequent.
Avoid this by stopping sched scan after detecting sched scan results
were received but no matched network. Don't start another sched
scan immediately but wait for the next normal scan without any results
to restart it. This prevents the tight loop.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When using a separate group iface both p2p device iface
and the group iface are registered for action frames.
This causes duplicate handling of rx action frames.
One side effect of this is getting multiple responses for
requests sent over action frames while GO/CLI are up
like prov disc and dev disc.
Fix this by discarding the duplicate p2p action frames received
on the group iface. The code will handle all of these correctly
when coming on the p2p dev iface as it looks at the DA when
where relevant.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The previous value of 30s was problematic in passing WiFi Direct
certification test 6.1.12. In this test the GO is checked for
buffering packets while the client is in PS and doesn't send a trigger
to get out of PS for 50s. Any value less than 50s would lead to a
failed inactivity check and the GO disconnecting the client in this test.
It's important to minimize p2p_go_max_inactivity as it helps the GO
detect clients which disconnected despite missing on the deauth frame.
This is not uncommon in JB as there are scans on the STA interface
which take us off the GO oper channel. Until the GO performs an
inactivity check the UI will keep showing the client as "Connected"
and the GO will remain operational which creates a bad user experience.
[This should supersede "P2P: set P2P_GO_MAX_INACTIVITY to 100s" in
the next rebase]
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
WiFi Direct certification test 6.1.12 expects GO to be active
during 50 sec, so changing P2P_GO_MAX_INACTIVITY from 30 sec
to 100 sec to pass the test.
Signed-off-by: Igal Chernobelsky <igalc@ti.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Current SETBAND would trigger network selection and as part of this
a scan attempt. This is not required in case SETBAND didn't change the
existing setting.
In Android which sends SETBAND immediately after WiFi startup this
would trigger needless scan attempts which would usually fail with -EBUSY
as another framework triggers scan was already going on.
The retry mechanism would then attempt further scans every 1 sec.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The switch to triggering a normal scan initially was done
to prevent interference between sched scan and normal scan.
This is no longer an issue. Triggering a sched scan is better
as it works better in our case than the normal scan
wrt hidden networks.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| | |
Our solution supports this and it speeds up initial connection
to hidden networks.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Some drivers support sched scan and normal scan. Enable this
by configuration of concurrent_sched_scan=1
This can speed up connection to scan_ssid=1 networks as
the sched scan doesn't get interrupted by a normal scan
for wildcard SSID.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In the case of max_scan_ssids=1 we may fallback to normal scan
if there's a single scan_ssid network. However the normal scan
can't add a wildcard SSID to the ssid list as it's limited to a single
entry. This delays getting broadcast scan results.
Always prefer to do a sched scan in such a case.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This prevents P2P IEs from being added to probes of scans on the
STA interface. These are not needed and prolong required channel
dwell time and Tx of probes.
This is somewhat of a hack but was a preferred approach on adding
framework changes to add p2p_disabled=1 to p2p_supplicant.conf and
not to wpa_supplicant.conf when both are created from the same template.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
By default, P2P is enabled globally for all virtual interfaces and this
makes wpa_supplicant include WSC and P2P IEs in Probe Request frames for
all scans even if this is for a non-P2P station connection to speed up
device discovery. If an interface is dedicated for non-P2P station mode
operations, it is now possible to disable addition of WSC and P2P IEs
into Probe Request frames with a per-interface p2p_disabled parameter.
This can be set either in the configuration file (p2p_disabled=1) or at
run time ("wpa_cli -i wlan0 set p2p_disabled 1"). Unlike the previous
mechanism ("wpa_cli p2p_set disabled 1"), the new parameter changes the
behavior only for the specified interface while other interfaces
continue to follow the global P2P enabled/disabled state.
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This is replaced by a recent patch by Jouni in the upstream:
"P2P: Allow P2P functionality to be disabled per interface"
This reverts commit a56f6df6f8e5dcd650893e8beb4a16a633c179d1.
Conflicts:
src/p2p/p2p.c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
In the case of a persistent GO invoking a P2P group by invite
the P2P client starts scanning for the GO but it might still
not be up. If not found the next scan is scheduled for scan_interval
secs but this too long.
Speed up scans to find GO like it's being done in P2P provisioing.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Configuring two identical SSIDs - one with WEP-SHARED
security and one with AES/TKIP breaks any authentication
attempt with WEP-SHARED SSID.
Reason for this behavior is that during BSS selection
from the priority group wrong BSS (with AES/TKIP) was
selected. Fix this by disallowing "non-WPA/WPA2" BSS
selection with defined rsn_ie/wpa_ie.
Signed-off-by: Victor Goldenshtein <victorg@ti.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
With the availability of MASK option, the number of lines per BSS is not obvious,
add a delimiter to make parsing less flaky
Bug: 2961159
Change-Id: I9e5523f8da183e0735dbc06f0c09c9f841060504
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
p2p_group_remove * calls wpas_p2p_disconnect on all
interfaces including non P2P ones. This has undesired
effects such as disconnecting concurrent connected STA
interfaces as well as emitting P2P-GROUP-REMOVED events
on all interfaces including ones that didn't actually
have a P2P CLI or GO running.
Instead fail explicitly when attempting to p2p disconnect
an interface with no P2P activity.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| | |
When operating as a GO, disassoc the peer station on aging/Tx failure
Signed-off-by: Arik Nemtsov <arik@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The roc on a channel for 100+ ms which is part of the find
disturbs the P2P GO/CLI as these scenarios are unsupported
in non multi channel driver.
Therefore block the find in this case.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Stop blocking GO role if its operational channel
differs from the STA channel, as now the driver
can handle channel conflicts by sending channel
switch request to the userspace.
Signed-off-by: Victor Goldenshtein <victorg@ti.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Should be squashed with:
commit 61d59eaa7ebf59c926d40b00228e227b3d27f8c9
Author: Arik Nemtsov <arik@wizery.com>
Date: Mon Sep 24 17:39:23 2012 +0200
P2P: add conf param to prefer p2p multi channel
Reported-by: Eyal Shapira <eyal@wizery.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Set the p2p_multi_chan parameter to 1 by default. It will have no effect
if the current driver doesn't support multi-channel. Otherwise it will
allow the P2P channel to be set while disregarding other connected
interfaces on the phy.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When p2p_multi_chan=1 is set in the wpa_supplicant.conf file, don't set
the P2P operating channel according to any existing shared frequency.
Normally we would force the operating channel to be the same as that of
other interfaces operating on the same phy. This param allow us to optimize
P2P user experience by allowing an arbitrary operating channel.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
|
| |
| |
| |
| |
| |
| |
| | |
When the multi-channel flag is on, don't try to force specific
p2p connection modes or change go_intent.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add channel switch command and handle channel switch
request/complete events.
New hostapd_eid_csa() which builds the channel switch
announcement IE. Add this CSA to the beacon frame prior
performing a channel switch and remove it once it's
completed.
New EVENT_REQ_CH_SW which indicates that the driver
has requested to perform a channel switch.
Signed-hostap: Victor Goldenshtein <victorg@ti.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In Android we don't have to hardcode device related parameters
in wpa_supplicant.conf file. It comes from Android properties as shown below,
device_name --> ro.product.name
manufacturer --> ro.product.manufacturer
model_name --> ro.product.model
model_number --> ro.product.model
serial_number --> ro.serialno
Also use_p2p_group_interface=1 part is defined in service defenition
Change-Id: Ifd6c60c3c493a52c8a4dd45ab9cfcb244e1b7c71
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
|
|
|
|
| |
Signed-off-by: Arik Nemtsov <arik@wizery.com>
|
|
|
|
|
|
|
|
|
|
| |
When specified in the conf file this parameter will make all
invocations of p2p_group_add and p2p_connect behave as if "ht40"
has been specified on the command line.
This shouldn't do harm since regulatory constraints and driver
capabilities are consulted anyway before starting HT40 mode.
Signed-hostap: Arik Nemtsov <arik@wizery.com>
|
|
|
|
|
|
|
| |
Increase GO config timeout if HT40 is used since it takes some time
to scan channels for coex purposes before the BSS can be started.
Signed-hostap: Jouni Malinen <j@w1.fi>
|
|
|
|
|
|
|
| |
This can be used to start negotiated GO in 40 MHz channel width
in 5GHz band.
Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
|
|
|
|
|
|
|
|
| |
Add optional "ht40" argument for p2p_group_add command to enable 40 MHz
in 5GHz band. This configures the secondary channel, when HT support is
enabled and if the HW supports 40 MHz channel width.
Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
|
|
|
|
| |
Signed-hostap: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
|
|
|
|
|
|
|
|
|
| |
If bgscan is enabled, then bgscan is initiated after the connection,
with no bss scan result information. Since a scan was performed prior to
the connection, the information exists and can be used to initialize the
bgscan's cache.
Signed-hostap: Yoni Divinsky <yoni.divinsky@ti.com>
|
|
|
|
|
|
|
| |
This reverts commit 1cd9da6b88d7dd9b3c887b62a584aba4bb08299f.
This old commit has a memory leak. Use a newer commit from upstream that
amends this.
|
|
|
|
|
|
|
|
|
|
| |
There is no need to mandate admission control (ACM=1) by default, so
clear that flag in the case the configuration file does not specify
wmm_ac_{vo,vi}_acm value. This gets closer to the values mentioned
in the sample hostapd.conf file and reduces the need to specify WMM
parameters in the configuration file for most common use cases.
Signed-hostap: Jouni Malinen <j@w1.fi>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Allow the p2p_connect command to ignore android p2p concurrency
considerations.
Use the command line argument "no_p2p_conc" to p2p_connect in order to
be able to set the go_intent.
For instance:
wpa_cli p2p_connect 00:11:22:33:44:55 pbc no_p2p_conc go_intent=3
Signed-off-by: Arik Nemtsov <arik@wizery.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The current code caused P2P and consquently WPS IEs to be added
to any probe as the check was for non null global->p2p.
global->p2p gets set whenever P2P is initialized globally
and that occurs on the first interface init.
Fix this by indicating wps is in use only when in active P2P
discovery or connection establishement.
(i.e. not P2P_IDLE - either doing search, neg or provisioning)
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
|
|
|
|
|
|
|
|
| |
Refactoring done in
commit 46ee04 IEEE 802.11u: Allow Interworking and HESSID to be configured
broke adding extra ies in sched scan.
Fix it and remove unused params arg in wpa_supplicant_extra_ies.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
data may be NULL and should be checked before dereferencing it.
This can happen when scan times out for example.
Another bug fixed is that sched scan wouldn't be kick started
from anywhere. Previously it was started following a normal scan
which didn't find any results. Fix it by start it if it's not running.
(These issues were introduced by commit
a523a28 wpa_s: don't reschedule the sched scan on each scan complete event
and the fix should be squashed into it)
Signed-off-by: Eyal Shapira <eyal@wizery.com>
Signed-off-by: Victor Goldenshtein <victorg@ti.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If the network entry is created with both WPA_AUTH_ALG_OPEN and
WPA_AUTH_ALG_SHARED set in wpa_s->current_ssid->auth_alg, the
existing logic will end up picking WPA_AUTH_ALG_LEAP instead of
shared when open authentication fails.
Fix this by using a bitwise-and to check for WPA_AUTH_ALG_OPEN instead.
(Should be squashed into commit
2e35a02 SME: Handle Netgear APs WEP shared quirks)
Signed-Off-By: William List <wlist@ti.com>
Signed-Off-By: Eyal Shapira <eyal@wizery.com>
|
|
|
|
|
|
| |
dev.config_methods was not updated when wps_update_config was called.
This could lead to mismatching config methods between Probe Request and
M1 packets. Add missing part for it.
|
|
|
|
|
|
| |
Found using valgrind.
Signed-hostap: Paul Stewart <pstew@chromium.org>
|
|
|
|
|
|
|
|
|
|
|
| |
Set p2p_go_max_inactivity to 30 secs (instead of the default
of 300 secs) to avoid creating a user of experience of a
WiFi Direct connection which doesn't disconnect. This may
happen if the P2P GO interface misses a deauth/disassoc frame
and keeps on thinking the client is connected. Limit this
time to 30 secs which creates a better user experience.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This enables setting a different max inactivity timeout for P2P GO.
This timeout is used to detect inactive clients. In some scenarios
it may be useful to have control over this and set a shorter timeout
than the default 300s. For example when running STA and P2P GO interfaces
concurrently, the STA interface may perform scans which may cause the
GO to miss a disassoc / deauth frames from a client and keep assuming
that the client is connected until the inactivity detection kicks in.
300 secs is a bit too long for such scenarios and creates a bad user
experience.
Signed-off-by: Eyal Shapira <eyal@wizery.com>
|
|
|
|
|
|
|
|
|
|
| |
Make sure we operate the same way as BRCM, with a separate group
interface, by incorporating a driver param.
Also set a default p2p_conc_mode (set to 2), to fit WL6/7 cards. Note
this will have to be changed to p2p_conc_mode=1 for WL8 cards.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
|