X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=carlfw%2Fsrc%2Ffw.c;h=a934687a9feaf1a10d87474e66e086732fa64c2b;hb=bf38ae52cd2ec91f5abeadc00c4e17fc647c2bc0;hp=1af4d90f595c3b445adf9cc64afd22d010aedf0c;hpb=19e4d682fca010ef72e0a304335910f670c2268a;p=carl9170fw.git

diff --git a/carlfw/src/fw.c b/carlfw/src/fw.c
index 1af4d90..a934687 100644
--- a/carlfw/src/fw.c
+++ b/carlfw/src/fw.c
@@ -3,7 +3,7 @@
  *
  * Firmware descriptor
  *
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 	FILL(otus, OTUS,
 	     .feature_set = cpu_to_le32(BIT(CARL9170FW_DUMMY_FEATURE) |
 					BIT(CARL9170FW_USB_RESP_EP2) |
+					BIT(CARL9170FW_RX_FILTER) |
 #ifdef CONFIG_CARL9170FW_USB_INIT_FIRMWARE
 					BIT(CARL9170FW_USB_INIT_FIRMWARE) |
 # ifdef CONFIG_CARL9170FW_USB_UP_STREAM
@@ -46,6 +47,7 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 #endif /* CONFIG_CARL9170FW_USB_INIT_FIRMWARE */
 #ifdef CONFIG_CARL9170FW_RADIO_FUNCTIONS
 					BIT(CARL9170FW_COMMAND_PHY) |
+					BIT(CARL9170FW_PSM) |
 #endif /* CONFIG_CARL9170FW_RADIO_FUNCTIONS */
 #ifdef CONFIG_CARL9170FW_SECURITY_ENGINE
 					BIT(CARL9170FW_COMMAND_CAM) |
@@ -62,14 +64,10 @@ const struct carl9170_firmware_descriptor __section(fwdsc) carl9170fw_desc = {
 #ifdef CONFIG_CARL9170FW_GPIO_INTERRUPT
 					BIT(CARL9170FW_GPIO_INTERRUPT) |
 #endif /* CONFIG_CARL9170FW_GPIO_INTERRUPT */
-#ifdef CONFIG_CARL9170FW_PSM
-					BIT(CARL9170FW_PSM) |
-#endif /* CONFIG_CARL9170FW_PSM */
-					BIT(CARL9170FW_RX_FILTER) |
 #ifdef CONFIG_CARL9170FW_WOL
 					BIT(CARL9170FW_WOL) |
 #endif /* CONFIG_CARL9170FW_WOL */
-					   (0)),
+					(0)),
 
 	     .miniboot_size = cpu_to_le16(0),
 	     .tx_descs = AR9170_TX_BLOCK_NUMBER,