diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2019-02-20 21:01:27 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2019-02-20 21:01:27 +0300 |
| commit | 6c88e0ce5ebcbac8ac930c0149c217c6aa7ab0a3 (patch) | |
| tree | 59c6c434839e7469e85ec5bdd68f17d7d6bad2c4 /drivers/net/wireless/ath/ath10k/p2p.h | |
| parent | 5d04b22b881d2b21569304fd6930509bb232fa0d (diff) | |
| parent | f0553ca9ceb5ff403623e31b7501d33ec84ce1fa (diff) | |
| download | linux-6c88e0ce5ebcbac8ac930c0149c217c6aa7ab0a3.tar.xz | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for 5.1. Major changes:
ath10k
* support WPA3 with WCN3990
* support for mac80211 airtime fairness based on transmit rate
estimation, the firmware needs to support WMI_SERVICE_PEER_STATS to
enable this
* report transmit airtime to mac80211 with firmwares having
WMI_SERVICE_REPORT_AIRTIME feature, this to have more accurate
airtime fairness based on real transmit time (instead of just
estimated from transmit rate)
* support Fine Timing Measurement (FTM) responder role
* add dynamic VLAN support with firmware having
WMI_SERVICE_PER_PACKET_SW_ENCRYPT
* switch to use SPDX license identifiers
Diffstat (limited to 'drivers/net/wireless/ath/ath10k/p2p.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath10k/p2p.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/wireless/ath/ath10k/p2p.h b/drivers/net/wireless/ath/ath10k/p2p.h index 7be616e2e121..7d7f44809fbb 100644 --- a/drivers/net/wireless/ath/ath10k/p2p.h +++ b/drivers/net/wireless/ath/ath10k/p2p.h @@ -1,17 +1,6 @@ +/* SPDX-License-Identifier: ISC */ /* * Copyright (c) 2015 Qualcomm Atheros, Inc. - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #ifndef _P2P_H |