From: Christian Lamparter <chunkeey@googlemail.com>
Date: Sat, 7 Jul 2012 15:47:25 +0000 (+0200)
Subject: Merge branch 'master' into radar
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=6ad7dd18fb9a1c674708e32fce3f4e89c8f1d83d;p=carl9170fw.git

Merge branch 'master' into radar

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

6ad7dd18fb9a1c674708e32fce3f4e89c8f1d83d
diff --cc carlfw/include/carl9170.h
index df41f84,cb16415..300d291
--- a/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 include/shared/fwdesc.h
index 903a346,66848d4..f73373e
--- a/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 0f674f7,0d5cd09..b2441f7
--- a/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,