diff options
| author | David S. Miller <davem@davemloft.net> | 2021-04-13 14:12:34 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-04-13 14:12:34 -0700 |
| commit | 5fff4c14ae01275a3432ecebcf6c3e6c1bd14932 (patch) | |
| tree | 7c529311357f7871215a1f1a2dddad638deffe4f /drivers/net/wireless/mediatek/mt7601u/eeprom.c | |
| parent | 8ef7adc6beb2ef0bce83513dc9e4505e7b21e8c2 (diff) | |
| parent | fa9f5d0e0b45a06802f7cb3afed237be6066821e (diff) | |
Merge tag 'wireless-drivers-next-2021-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Kalle Valo says:
====================
wireless-drivers-next patches for v5.13
First set of patches for v5.13. I have been offline for a couple of
and I have a smaller pull request this time. The next one will be
bigger. Nothing really special standing out.
ath11k
* add initial support for QCN9074, but not enabled yet due to firmware problems
* enable radar detection for 160MHz secondary segment
* handle beacon misses in station mode
rtw88
* 8822c: support firmware crash dump
mt7601u
* enable TDLS support
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt7601u/eeprom.c')
| -rw-r--r-- | drivers/net/wireless/mediatek/mt7601u/eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mediatek/mt7601u/eeprom.c b/drivers/net/wireless/mediatek/mt7601u/eeprom.c index c868582c5d22..aa3b64902cf9 100644 --- a/drivers/net/wireless/mediatek/mt7601u/eeprom.c +++ b/drivers/net/wireless/mediatek/mt7601u/eeprom.c @@ -99,7 +99,7 @@ mt7601u_has_tssi(struct mt7601u_dev *dev, u8 *eeprom) { u16 nic_conf1 = get_unaligned_le16(eeprom + MT_EE_NIC_CONF_1); - return ~nic_conf1 && (nic_conf1 & MT_EE_NIC_CONF_1_TX_ALC_EN); + return (u16)~nic_conf1 && (nic_conf1 & MT_EE_NIC_CONF_1_TX_ALC_EN); } static void |