Merge branch 'master' into radar

Conflicts:
	carlfw/include/carl9170.h
	include/shared/fwdesc.h
	include/shared/version.h
	tools/src/fwinfo.c

diff --cc carlfw/include/carl9170.h
index df41f8461bf4e1acbfb1fadf7c63a2234de74e58,cb16415c5adbeed7a0350f99f680ccda3f19b453..300d291a1c97d2a0e475813b7df3ca9e21aafe75
--- 1/carlfw/include/carl9170.h
--- 2/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@@ -144,9 -143,7 +144,11 @@@ struct firmware_context_struct 
                             ba_head_idx,
                             queued_ba;
  
+               unsigned int queued_bar;
++
 +              unsigned int soft_radar,
 +                           radar_last,
 +                           pattern_index;
        } wlan;
  
        struct {

diff --cc carlfw/src/fw.c
Simple merge

diff --cc include/shared/fwdesc.h
index 903a346bebd54061785f2909eb24fb254abdf584,66848d47c88e993c2c04d328699e94249c5bad61..f73373eca25cc42b4d68035a394240f959d2b489
--- 1/include/shared/fwdesc.h
--- 2/include/shared/fwdesc.h
+++ b/include/shared/fwdesc.h
@@@ -78,9 -78,9 +78,12 @@@ enum carl9170fw_feature_list 
        /* HW (ANI, CCA, MIB) tally counters */
        CARL9170FW_HW_COUNTERS,
  
 +      /* Radar pattern generator */
 +      CARL9170FW_RADAR_PATTERN_GENERATOR,
 +
+       /* Firmware will pass BA when BARs are queued */
+       CARL9170FW_RX_BA_FILTER,
+ 
        /* KEEP LAST */
        __CARL9170FW_FEATURE_NUM
  };

diff --cc tools/src/fwinfo.c
index 0f674f72075c5ed7c2a953163a6dd3d6fa09c257,0d5cd0947922d92243c61645a3b0ecb7f88827ed..b2441f7cce837b83fdaa595d9181d25553d4d91c
--- 1/tools/src/fwinfo.c
--- 2/tools/src/fwinfo.c
+++ b/tools/src/fwinfo.c
@@@ -68,7 -68,7 +68,8 @@@ static const struct feature_list known_
        CHECK_FOR_FEATURE(CARL9170FW_WOL),
        CHECK_FOR_FEATURE(CARL9170FW_FIXED_5GHZ_PSM),
        CHECK_FOR_FEATURE(CARL9170FW_HW_COUNTERS),
+       CHECK_FOR_FEATURE(CARL9170FW_RX_BA_FILTER),
 +      CHECK_FOR_FEATURE(CARL9170FW_RADAR_PATTERN_GENERATOR),
  };
  
  static void check_feature_list(const struct carl9170fw_desc_head *head,