diff options
| author | David S. Miller <davem@davemloft.net> | 2020-08-04 12:57:02 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-04 12:57:02 -0700 |
| commit | cabf06e5a275dde2a336c71536465b30ccf2ae4d (patch) | |
| tree | ae1f65051c45a1bf217e86e33e41412dcfb40178 /drivers/net/wireless/ralink/rt2x00/rt2x00soc.c | |
| parent | 93f4ddd64b7dca8279ad052e0d58d92b67c33907 (diff) | |
| parent | 2cfd71f1a43e9e1053db6c84f2dc33fe88128f67 (diff) | |
| download | lwn-cabf06e5a275dde2a336c71536465b30ccf2ae4d.tar.gz lwn-cabf06e5a275dde2a336c71536465b30ccf2ae4d.zip | |
Merge tag 'wireless-drivers-next-2020-08-04' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for v5.9
Second set of patches for v5.9. mt76 has most of patches this time.
Otherwise it's just smaller fixes and cleanups to other drivers.
There was a major conflict in mt76 driver between wireless-drivers and
wireless-drivers-next. I solved that by merging the former to the
latter.
Major changes:
rtw88
* add support for ieee80211_ops::change_interface
* add support for enabling and disabling beacon
* add debugfs file for testing h2c
mt76
* ARP filter offload for 7663
* runtime power management for 7663
* testmode support for mfg calibration
* support for more channels
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/ralink/rt2x00/rt2x00soc.c')
| -rw-r--r-- | drivers/net/wireless/ralink/rt2x00/rt2x00soc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c index 596b8a432946..eface610178d 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00soc.c @@ -130,7 +130,7 @@ int rt2x00soc_suspend(struct platform_device *pdev, pm_message_t state) struct ieee80211_hw *hw = platform_get_drvdata(pdev); struct rt2x00_dev *rt2x00dev = hw->priv; - return rt2x00lib_suspend(rt2x00dev, state); + return rt2x00lib_suspend(rt2x00dev); } EXPORT_SYMBOL_GPL(rt2x00soc_suspend); |