From: Malcolm Priestley Date: Wed, 29 Oct 2014 17:56:03 +0000 (+0000) Subject: staging: vt6655: Move LIFETIME RES 64us macros to rxtx.h X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1903e6dd0552d15a39664d71e4ebb9f0769969cc;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git staging: vt6655: Move LIFETIME RES 64us macros to rxtx.h Used only by vnt_generate_fifo_header move these macros. Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vt6655/rxtx.h b/drivers/staging/vt6655/rxtx.h index 50d77a0f88ea..cf0dfa6f0a07 100644 --- a/drivers/staging/vt6655/rxtx.h +++ b/drivers/staging/vt6655/rxtx.h @@ -32,6 +32,10 @@ #include "ttype.h" #include "device.h" +#define DEFAULT_MSDU_LIFETIME_RES_64us 8000 /* 64us */ +#define DEFAULT_MGN_LIFETIME_RES_64us 125 /* 64us */ + + /*--------------------- Export Definitions -------------------------*/ /*--------------------- Export Variables --------------------------*/ diff --git a/drivers/staging/vt6655/wmgr.h b/drivers/staging/vt6655/wmgr.h index 74f1f16b915e..daf996cc9f27 100644 --- a/drivers/staging/vt6655/wmgr.h +++ b/drivers/staging/vt6655/wmgr.h @@ -51,10 +51,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)