diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-19 18:32:30 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-19 18:32:30 -0700 |
| commit | 932630fa902878f4c8c50d0b1260eeb9de16b0a4 (patch) | |
| tree | 6b67dc45af34ab0cdefe95c8fbaeb077c14bdd7f /drivers/net/wireless/marvell/mwifiex/scan.c | |
| parent | 5483ecefe9602502441b0b76968f9c4f888ad242 (diff) | |
| parent | 6004cf298a4180199dc40bc40466126df8a5a88c (diff) | |
| download | linux-932630fa902878f4c8c50d0b1260eeb9de16b0a4.tar.bz2 | |
Merge tag 'wireless-drivers-next-for-davem-2019-08-19' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for 5.4
First set of patches for 5.4.
Major changes:
brcmfmac
* enable 160 MHz channel support
rt2x00
* add support for PLANEX GW-USMicroN USB device
rtw88
* add Bluetooth coexistance support
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/marvell/mwifiex/scan.c')
| -rw-r--r-- | drivers/net/wireless/marvell/mwifiex/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/marvell/mwifiex/scan.c b/drivers/net/wireless/marvell/mwifiex/scan.c index 21dda385f6c6..593c594982cb 100644 --- a/drivers/net/wireless/marvell/mwifiex/scan.c +++ b/drivers/net/wireless/marvell/mwifiex/scan.c @@ -1244,7 +1244,7 @@ int mwifiex_update_bss_desc_with_ie(struct mwifiex_adapter *adapter, mwifiex_dbg(adapter, ERROR, "err: InterpretIE: in processing\t" "IE, bytes left < IE length\n"); - return -1; + return -EINVAL; } switch (element_id) { case WLAN_EID_SSID: |