Merge tag 'wireless-drivers-next-for-davem-2017-11-11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next

Kalle Valo says:

====================
wireless-drivers-next patches for 4.15

Last minute patches before the merge window. Not really anything
special standing out, mostly fixes or cleanup and some minor new
features.

Major changes:

iwlwifi

* some new PCI IDs
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
index 0fe723ca844e..c69515ed72df 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c
@@ -67,12 +67,8 @@ static u8 rs_ht_to_legacy[] = {
 static const u8 ant_toggle_lookup[] = {
         [ANT_NONE] = ANT_NONE,
         [ANT_A] = ANT_B,
-        [ANT_B] = ANT_C,
-        [ANT_AB] = ANT_BC,
-        [ANT_C] = ANT_A,
-        [ANT_AC] = ANT_AB,
-        [ANT_BC] = ANT_AC,
-        [ANT_ABC] = ANT_ABC,
+        [ANT_B] = ANT_A,
+        [ANT_AB] = ANT_AB,
 };
 
 #define IWL_DECLARE_RATE_INFO(r, s, rp, rn)                           \
@@ -975,7 +971,7 @@ static int rs_toggle_antenna(u32 valid_ant, struct rs_rate *rate)
 {
         u8 new_ant_type;
 
-        if (!rate->ant || rate->ant > ANT_ABC)
+        if (!rate->ant || WARN_ON_ONCE(rate->ant & ANT_C))
                 return 0;
 
         if (!rs_is_valid_ant(valid_ant, rate->ant))