From: Malcolm Priestley Date: Wed, 25 Jun 2014 20:19:39 +0000 (+0100) Subject: staging: vt6656: move life time macros to rxtx.h X-Git-Tag: v5.15~17495^2~1474 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=93a1e1b0791f66e76d2561a184b7f9d6151d56a0;p=platform%2Fkernel%2Flinux-starfive.git staging: vt6656: move life time macros to rxtx.h DEFAULT_MGN_LIFETIME_RES_64us DEFAULT_MSDU_LIFETIME_RES_64us Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman --- 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)