summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-06-25 21:19:39 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-26 20:23:29 -0400
commit93a1e1b0791f66e76d2561a184b7f9d6151d56a0 (patch)
treeeacd2b3bf53353d3e2db86ac28fc6577ea74f396
parent9ef2184d0eead64829eb80714c8ee8a163632b87 (diff)
downloadop-kernel-dev-93a1e1b0791f66e76d2561a184b7f9d6151d56a0.zip
op-kernel-dev-93a1e1b0791f66e76d2561a184b7f9d6151d56a0.tar.gz
staging: vt6656: move life time macros to rxtx.h
DEFAULT_MGN_LIFETIME_RES_64us DEFAULT_MSDU_LIFETIME_RES_64us Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6656/rxtx.h3
-rw-r--r--drivers/staging/vt6656/wmgr.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/staging/vt6656/rxtx.h b/drivers/staging/vt6656/rxtx.h
index 65f7e26..00a5c22 100644
--- a/drivers/staging/vt6656/rxtx.h
+++ b/drivers/staging/vt6656/rxtx.h
@@ -33,6 +33,9 @@
#include "wcmd.h"
#include "baseband.h"
+#define DEFAULT_MGN_LIFETIME_RES_64us 125 /* 64us */
+#define DEFAULT_MSDU_LIFETIME_RES_64us 8000
+
/* MIC HDR data header */
struct vnt_mic_hdr {
u8 id;
diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h
index 26ba47d..b6610a1 100644
--- a/drivers/staging/vt6656/wmgr.h
+++ b/drivers/staging/vt6656/wmgr.h
@@ -53,10 +53,8 @@
#define WCMD_PASSIVE_SCAN_TIME 100 //(ms)
#define DEFAULT_MSDU_LIFETIME 512 // ms
-#define DEFAULT_MSDU_LIFETIME_RES_64us 8000 // 64us
#define DEFAULT_MGN_LIFETIME 8 // ms
-#define DEFAULT_MGN_LIFETIME_RES_64us 125 // 64us
#define MAKE_BEACON_RESERVED 10 //(us)
OpenPOWER on IntegriCloud