projects
/
carl9170fw.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
carl9170 firmware: fix use of uninitialized value
[carl9170fw.git]
/
carlfw
/
include
/
config.h
diff --git
a/carlfw/include/config.h
b/carlfw/include/config.h
index b947f59b60f8fa4d3fdd2563853ec7ec9b9ed0ed..bebb26005e1c93872baf31e9780a733f6a841893 100644
(file)
--- a/
carlfw/include/config.h
+++ b/
carlfw/include/config.h
@@
-19,12
+19,11
@@
#include "types.h"
#include "compiler.h"
#include "fwcmd.h"
#include "types.h"
#include "compiler.h"
#include "fwcmd.h"
+#include "hw.h"
#ifndef __CARL9170FW_CONFIG_H
#define __CARL9170FW_CONFIG_H
#ifndef __CARL9170FW_CONFIG_H
#define __CARL9170FW_CONFIG_H
-#define __CARL9170FW__
-
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
#if GCC_VERSION < 40400
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
#if GCC_VERSION < 40400
@@
-43,7
+42,6
@@
#define CARL9170_TX_STATUS_NUM (CARL9170_RSP_TX_STATUS_NUM)
#define CARL9170_INT_RQ_CACHES 16
#define AR9170_INT_MAGIC_HEADER_SIZE 12
#define CARL9170_TX_STATUS_NUM (CARL9170_RSP_TX_STATUS_NUM)
#define CARL9170_INT_RQ_CACHES 16
#define AR9170_INT_MAGIC_HEADER_SIZE 12
-#define CARL9170_USB_WATCHDOG_TRIGGER_THRESHOLD 4
#define CARL9170_TBTT_DELTA (CARL9170_PRETBTT_KUS + 1)
#define CARL9170_GPIO_MASK (AR9170_GPIO_PORT_WPS_BUTTON_PRESSED)
#define CARL9170_TBTT_DELTA (CARL9170_PRETBTT_KUS + 1)
#define CARL9170_GPIO_MASK (AR9170_GPIO_PORT_WPS_BUTTON_PRESSED)
@@
-54,6
+52,8
@@
#define CARL9170_INTF_NUM (1)
#endif /* CONFIG_CARL9170FW_VIFS_NUM */
#define CARL9170_INTF_NUM (1)
#endif /* CONFIG_CARL9170FW_VIFS_NUM */
+#define CONFIG_CARL9170FW_BACK_REQS_NUM 4
+
#if ((defined CONFIG_CARL9170FW_DEBUG) || \
(defined CONFIG_CARL9170FW_LOOPBACK))
#define CARL9170FW_UNUSABLE y
#if ((defined CONFIG_CARL9170FW_DEBUG) || \
(defined CONFIG_CARL9170FW_LOOPBACK))
#define CARL9170FW_UNUSABLE y
@@
-62,12
+62,8
@@
static inline void __config_check(void)
{
BUILD_BUG_ON(!CARL9170_TX_STATUS_NUM);
static inline void __config_check(void)
{
BUILD_BUG_ON(!CARL9170_TX_STATUS_NUM);
- BUILD_BUG_ON(CARL9170_USB_WATCHDOG_TRIGGER_THRESHOLD < 2);
BUILD_BUG_ON(CARL9170_INTF_NUM < 1);
BUILD_BUG_ON(CARL9170_INTF_NUM < 1);
-
-#ifdef CONFIG_CARL9170FW_HANDLE_BACK_REQ
- BUILD_BUG_ON(!CONFIG_CARL9170FW_BACK_REQS_NUM);
-#endif /* CONFIG_CARL9170FW_HANDLE_BACK_REQ */
+ BUILD_BUG_ON(CARL9170_INTF_NUM >= AR9170_MAX_VIRTUAL_MAC);
}
#endif /* __CARL9170FW_CONFIG_H */
}
#endif /* __CARL9170FW_CONFIG_H */