diff options
author | David S. Miller <davem@davemloft.net> | 2020-09-25 13:16:29 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-09-25 13:16:29 -0700 |
commit | 7806f6561cd51de382f7628e7f4ecef4568d88da (patch) | |
tree | c2600f6278df49e7fe41836e9f96eab00df2ddb5 /drivers/net/wireless/ti | |
parent | aafe8853f5e2bcbdd231411aec218b8c5dc78437 (diff) | |
parent | bc8befe6f950264f2f4f6cbe267a3e934a15e26b (diff) | |
download | linux-stable-7806f6561cd51de382f7628e7f4ecef4568d88da.tar.gz linux-stable-7806f6561cd51de382f7628e7f4ecef4568d88da.tar.bz2 linux-stable-7806f6561cd51de382f7628e7f4ecef4568d88da.zip |
Merge tag 'wireless-drivers-next-2020-09-25' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for v5.10
Second set of patches for v5.10. Biggest change here is wcn3680
support to wcn36xx driver, otherwise smaller features. And naturally
the usual fixes and cleanups.
Major changes:
brcmfmac
* support 4-way handshake offloading for WPA/WPA2-PSK in AP mode
* support SAE authentication offload in AP mode
mt76
* mt7663 runtime power management improvements
* mt7915 A-MSDU offload
wcn36xx
* add support wcn3680 Wi-Fi 5 devices
ath11k
* spectral scan support for ipq6018
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ti')
-rw-r--r-- | drivers/net/wireless/ti/wlcore/debugfs.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ti/wlcore/main.c | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/drivers/net/wireless/ti/wlcore/debugfs.c b/drivers/net/wireless/ti/wlcore/debugfs.c index 48adb1876ab9..cce8d75d8b81 100644 --- a/drivers/net/wireless/ti/wlcore/debugfs.c +++ b/drivers/net/wireless/ti/wlcore/debugfs.c @@ -122,13 +122,6 @@ static void chip_op_handler(struct wl1271 *wl, unsigned long value, pm_runtime_put_autosuspend(wl->dev); } - -static inline void no_write_handler(struct wl1271 *wl, - unsigned long value, - unsigned long param) -{ -} - #define WL12XX_CONF_DEBUGFS(param, conf_sub_struct, \ min_val, max_val, write_handler_locked, \ write_handler_arg) \ diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index d2bbd5108f7e..6863fd552d5e 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -30,7 +30,6 @@ #include "sysfs.h" #define WL1271_BOOT_RETRIES 3 -#define WL1271_SUSPEND_SLEEP 100 #define WL1271_WAKEUP_TIMEOUT 500 static char *fwlog_param; |