X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Finclude%2Fcarl9170.h;h=d10a74e8064448eebbb60502a53b23c1bc7744ad;hb=2bd700be49afc4c07cf45d0b537980e35322173b;hp=ab8e9ff696d723c7328fe4fb53fbd124486fa7d0;hpb=1b6a3060adfff3171b8e605c7fea82f04cf7c768;p=carl9170fw.git

diff --git a/carlfw/include/carl9170.h b/carlfw/include/carl9170.h
index ab8e9ff..d10a74e 100644
--- a/carlfw/include/carl9170.h
+++ b/carlfw/include/carl9170.h
@@ -39,7 +39,6 @@ struct carl9170_bar_ctx {
 	uint8_t ra[6];
 	__le16 start_seq_num;
 	__le16 control;
-	__le32 phy;
 };
 
 #ifdef CONFIG_CARL9170FW_CAB_QUEUE
@@ -141,17 +140,8 @@ struct firmware_context_struct {
 		/* BA(R) Request Handler */
 		struct carl9170_bar_ctx ba_cache[CONFIG_CARL9170FW_BACK_REQS_NUM];
 		unsigned int ba_tail_idx,
-			     ba_head_idx;
-
-#ifdef CONFIG_CARL9170FW_WOL
-		struct {
-			struct carl9170_wol_cmd cmd;
-			unsigned int last_beacon;
-			unsigned int lost_null;
-			unsigned int last_null;
-			bool wake_up;
-		} wol;
-#endif /* CONFIG_CARL9170FW_WOL */
+			     ba_head_idx,
+			     queued_ba;
 	} wlan;
 
 	struct {
@@ -206,6 +196,16 @@ struct firmware_context_struct {
 	struct carl9170_tally_rsp tally;
 	unsigned int tx_time;
 
+#ifdef CONFIG_CARL9170FW_WOL
+	struct {
+		struct carl9170_wol_cmd cmd;
+		unsigned int last_beacon;
+		unsigned int lost_null;
+		unsigned int last_null;
+		bool wake_up;
+	} wol;
+#endif /* CONFIG_CARL9170FW_WOL */
+
 #ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
 	struct carl9170_gpio cached_gpio_state;
 #endif /*CONFIG_CARL9170FW_GPIO_INTERRUPT */