Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-13 06:32:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: csr: remove CsrBool typedef

Browse Source 
Use u8 instead.

Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2012-07-20 12:25:15 -07:00
parent c781b96b80
commit 5379b13d9e
38 changed files with 264 additions and 267 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/csr/csr_log.h
View File

@ -71,9 +71,9 @@ typedef u32 CsrLogLevelTask;
/* The bit masks between here are reserved for future usage */
#define CSR_LOG_LEVEL_TASK_ALL ((CsrLogLevelTask) 0xFFFFFFFF & ~(CSR_LOG_LEVEL_TASK_PRIM_ONLY_TYPE | CSR_LOG_LEVEL_TASK_PRIM_APPLY_LIMIT)) /* All info possible to log for a task are logged. WARNING: By using this define the application also accepts future possible task data/events in the logs */
CsrBool CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level);
u8 CsrLogEnvironmentIsFiltered(CsrLogLevelEnvironment level);
CsrLogLevelTask CsrLogTaskFilterGet(CsrSchedQid taskId);
CsrBool CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);
u8 CsrLogTaskIsFiltered(CsrSchedQid taskId, CsrLogLevelTask level);
/*
* Logging stuff
@ -193,7 +193,7 @@ void CsrLogMessagePut(u32 line,
void CsrLogMessageGet(CsrSchedQid src_task_id,
CsrSchedQid dst_taskid,
CsrBool get_res,
u8 get_res,
CsrSchedMsgId msg_id,
u16 prim_type,
const void *msg);
@ -216,7 +216,7 @@ void CsrLogTimedEventCancel(u32 line,
const char *file,
CsrSchedQid task_id,
CsrSchedTid tid,
CsrBool cancel_res);
u8 cancel_res);
void CsrLogBgintRegister(u8 thread_id,
CsrSchedBgint irq,

2
drivers/staging/csr/csr_macro.h
View File

@ -23,7 +23,7 @@ extern "C" {
#define CSR_MASK_IS_UNSET(val, mask) ((((val) & (mask)) ^ mask) == (mask))
#define CSR_MASK_SET(val, mask) ((val) |= (mask))
#define CSR_MASK_UNSET(val, mask) ((val) = ((val) ^ (mask)) & (val)) /* Unsets the bits in val that are set in mask */
#define CSR_BIT_IS_SET(val, bit) ((CsrBool) ((((val) & (1UL << (bit))) != 0)))
#define CSR_BIT_IS_SET(val, bit) ((u8) ((((val) & (1UL << (bit))) != 0)))
#define CSR_BIT_SET(val, bit) ((val) |= (1UL << (bit)))
#define CSR_BIT_UNSET(val, bit) ((val) &= ~(1UL << (bit)))
#define CSR_BIT_TOGGLE(val, bit) ((val) ^= (1UL << (bit)))

4
drivers/staging/csr/csr_msgconv.c
View File

@ -133,10 +133,10 @@ static CsrSize sizeof_message(u16 primType, void *msg)
return ret;
}
static CsrBool free_message(u16 primType, u8 *data)
static u8 free_message(u16 primType, u8 *data)
{
CsrMsgConvPrimEntry *ptr;
CsrBool ret;
u8 ret;
ptr = CsrMsgConvFind(primType);

2
drivers/staging/csr/csr_msgconv.h
View File

@ -51,7 +51,7 @@ typedef struct
{
CsrMsgConvPrimEntry *profile_converters;
void *(*deserialize_data)(u16 primType, CsrSize length, u8 * data);
CsrBool (*free_message)(u16 primType, u8 *data);
u8 (*free_message)(u16 primType, u8 *data);
CsrSize (*sizeof_message)(u16 primType, void *msg);
u8 *(*serialize_message)(u16 primType, void *msg,
CsrSize * length,

10
drivers/staging/csr/csr_sched.h
View File

@ -185,7 +185,7 @@ void CsrSchedMessageBroadcast(u16 mi,
* The message consists of one or both of a u16 and a void *.
*
* RETURNS
* CsrBool - TRUE if a message has been obtained from the queue, else FALSE.
* u8 - TRUE if a message has been obtained from the queue, else FALSE.
* If a message is taken from the queue, then "*pmi" and "*pmv" are set to
* the "mi" and "mv" passed to CsrSchedMessagePut() respectively.
*
@ -193,7 +193,7 @@ void CsrSchedMessageBroadcast(u16 mi,
* them message is discarded.
*
*----------------------------------------------------------------------------*/
CsrBool CsrSchedMessageGet(u16 *pmi, void **pmv);
u8 CsrSchedMessageGet(u16 *pmi, void **pmv);
/*----------------------------------------------------------------------------*
* NAME
@ -241,18 +241,18 @@ CsrSchedTid CsrSchedTimerSet(CsrTime delay,
* occurring.
*
* RETURNS
* CsrBool - TRUE if cancelled, FALSE if the event has already occurred.
* u8 - TRUE if cancelled, FALSE if the event has already occurred.
*
*----------------------------------------------------------------------------*/
#if defined(CSR_LOG_ENABLE) && defined(CSR_LOG_INCLUDE_FILE_NAME_AND_LINE_NUMBER)
CsrBool CsrSchedTimerCancelStringLog(CsrSchedTid eventid,
u8 CsrSchedTimerCancelStringLog(CsrSchedTid eventid,
u16 *pmi,
void **pmv,
u32 line,
const char *file);
#define CsrSchedTimerCancel(e, pmi, pmv) CsrSchedTimerCancelStringLog((e), (pmi), (pmv), __LINE__, __FILE__)
#else
CsrBool CsrSchedTimerCancel(CsrSchedTid eventid,
u8 CsrSchedTimerCancel(CsrSchedTid eventid,
u16 *pmi,
void **pmv);
#endif

3
drivers/staging/csr/csr_types.h
View File

@ -32,9 +32,6 @@ typedef ptrdiff_t CsrPtrdiff; /* Type of the result of subtracting two pointer
typedef uintptr_t CsrUintptr; /* Unsigned integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */
typedef ptrdiff_t CsrIntptr; /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */
/* Boolean */
typedef u8 CsrBool;
/*
* 64-bit integers
*

8
drivers/staging/csr/csr_utf16.c
View File

@ -261,7 +261,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source)
u32 length;
u32 sourceLength;
u8 bytes;
CsrBool appendNull = FALSE;
u8 appendNull = FALSE;
u8 firstByteMark[5] = {0x00, 0x00, 0xC0, 0xE0, 0xF0};
@ -463,7 +463,7 @@ u8 *CsrUtf16String2Utf8(const u16 *source)
TRUE if the given code unit is legal.
*****************************************************************************/
static CsrBool isLegalUtf8(const u8 *codeUnit, u32 length)
static u8 isLegalUtf8(const u8 *codeUnit, u32 length)
{
const u8 *srcPtr = codeUnit + length;
u8 byte;
@ -815,7 +815,7 @@ u16 *CsrUtf16String2XML(u16 *str)
u16 *outputString = NULL;
u16 *resultString = str;
u32 stringLength = 0;
CsrBool encodeChars = FALSE;
u8 encodeChars = FALSE;
scanString = str;
if (scanString)
@ -908,7 +908,7 @@ u16 *CsrXML2Utf16String(u16 *str)
u16 *outputString = NULL;
u16 *resultString = str;
u32 stringLength = 0;
CsrBool encodeChars = FALSE;
u8 encodeChars = FALSE;
scanString = str;
if (scanString)

10
drivers/staging/csr/csr_util.c
View File

@ -53,7 +53,7 @@ u8 CsrBitCountDense(u32 n)
/*------------------------------------------------------------------*/
/* Base conversion */
/*------------------------------------------------------------------*/
CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue)
u8 CsrHexStrToUint8(const char *string, u8 *returnValue)
{
u16 currentIndex = 0;
*returnValue = 0;
@ -77,7 +77,7 @@ CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue)
return FALSE;
}
CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue)
u8 CsrHexStrToUint16(const char *string, u16 *returnValue)
{
u16 currentIndex = 0;
*returnValue = 0;
@ -101,7 +101,7 @@ CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue)
return FALSE;
}
CsrBool CsrHexStrToUint32(const char *string, u32 *returnValue)
u8 CsrHexStrToUint32(const char *string, u32 *returnValue)
{
u16 currentIndex = 0;
*returnValue = 0;
@ -150,7 +150,7 @@ void CsrIntToBase10(s32 number, char *str)
s32 digit;
u8 index;
char res[I2B10_MAX];
CsrBool foundDigit = FALSE;
u8 foundDigit = FALSE;
for (digit = 0; digit < I2B10_MAX; digit++)
{
@ -423,7 +423,7 @@ const char *CsrGetBaseName(const char *file)
/*------------------------------------------------------------------*/
/* Misc */
/*------------------------------------------------------------------*/
CsrBool CsrIsSpace(u8 c)
u8 CsrIsSpace(u8 c)
{
switch (c)
{

8
drivers/staging/csr/csr_util.h
View File

@ -26,9 +26,9 @@ u8 CsrBitCountDense(u32 n);
/*------------------------------------------------------------------*/
/* Base conversion */
/*------------------------------------------------------------------*/
CsrBool CsrHexStrToUint8(const char *string, u8 *returnValue);
CsrBool CsrHexStrToUint16(const char *string, u16 *returnValue);
CsrBool CsrHexStrToUint32(const char *string, u32 *returnValue);
u8 CsrHexStrToUint8(const char *string, u8 *returnValue);
u8 CsrHexStrToUint16(const char *string, u16 *returnValue);
u8 CsrHexStrToUint32(const char *string, u32 *returnValue);
u32 CsrPow(u32 base, u32 exponent);
void CsrIntToBase10(s32 number, char *str);
void CsrUInt16ToHex(u16 number, char *str);
@ -85,7 +85,7 @@ const char *CsrGetBaseName(const char *file);
/*------------------------------------------------------------------*/
/* Misc */
/*------------------------------------------------------------------*/
CsrBool CsrIsSpace(u8 c);
u8 CsrIsSpace(u8 c);
#define CsrOffsetOf(st, m) ((CsrSize) & ((st *) 0)->m)
#ifdef __cplusplus

4
drivers/staging/csr/csr_wifi_fsm.h
View File

@ -226,9 +226,9 @@ extern void CsrWifiFsmTestAdvanceTime(CsrWifiFsmContext *context, u32 ms);
* @param[in] context : FSM context
*
* @return
* CsrBool returns TRUE if there are events for the FSM to process
* u8 returns TRUE if there are events for the FSM to process
*/
extern CsrBool CsrWifiFsmHasEvents(CsrWifiFsmContext *context);
extern u8 CsrWifiFsmHasEvents(CsrWifiFsmContext *context);
/**
* @brief

4
drivers/staging/csr/csr_wifi_fsm_types.h
View File

@ -220,7 +220,7 @@ typedef struct
typedef struct
{
const u8 numEntries;
const CsrBool saveAll;
const u8 saveAll;
const CsrWifiFsmEventEntry *eventEntryArray; /* array of transition function pointers for state */
#ifdef CSR_LOG_ENABLE
u16 stateNumber;
@ -391,7 +391,7 @@ struct CsrWifiFsmContext
#endif
u32 timeOffset; /* Amount to adjust the TimeOfDayMs by */
CsrWifiFsmTimerList timerQueue; /* The internal timer queue */
CsrBool useTempSaveList; /* Should the temp save list be used */
u8 useTempSaveList; /* Should the temp save list be used */
CsrWifiFsmEventList tempSaveList; /* The temp save event queue */
CsrWifiFsmEvent *eventForwardedOrSaved; /* The event that was forwarded or Saved */
u16 maxProcesses; /* Size of instanceArray */

4
drivers/staging/csr/csr_wifi_hip_card.h
View File

@ -43,7 +43,7 @@ CsrResult CardGenInt(card_t *card);
/*****************************************************************************
* CardPendingInt -
*/
CsrResult CardPendingInt(card_t *card, CsrBool *pintr);
CsrResult CardPendingInt(card_t *card, u8 *pintr);
/*****************************************************************************
* CardDisableInt -
@ -63,7 +63,7 @@ void CardDisable(card_t *card);
/*****************************************************************************
* CardIntEnabled -
*/
CsrResult CardIntEnabled(card_t *card, CsrBool *enabled);
CsrResult CardIntEnabled(card_t *card, u8 *enabled);
/*****************************************************************************
* CardGetDataSlotSize

8
drivers/staging/csr/csr_wifi_hip_card_sdio.c
View File

@ -3261,7 +3261,7 @@ CsrResult CardDisableInt(card_t *card)
* CSR_RESULT_FAILURE if an SDIO error occurred,
* ---------------------------------------------------------------------------
*/
CsrResult CardPendingInt(card_t *card, CsrBool *pintr)
CsrResult CardPendingInt(card_t *card, u8 *pintr)
{
CsrResult r;
u8 pending;
@ -3303,7 +3303,7 @@ CsrResult CardPendingInt(card_t *card, CsrBool *pintr)
CsrResult CardClearInt(card_t *card)
{
CsrResult r;
CsrBool intr;
u8 intr;
if (card->chip_id > SDIO_CARD_ID_UNIFI_2)
{
@ -3361,7 +3361,7 @@ CsrResult CardClearInt(card_t *card)
* CSR_RESULT_FAILURE if an SDIO error occurred,
* ---------------------------------------------------------------------------
*/
CsrResult CardIntEnabled(card_t *card, CsrBool *enabled)
CsrResult CardIntEnabled(card_t *card, u8 *enabled)
{
CsrResult r;
u8 int_enable;
@ -4036,7 +4036,7 @@ CsrResult unifi_check_io_status(card_t *card, s32 *status)
{
u8 io_en;
CsrResult r;
CsrBool pending;
u8 pending;
*status = 0;

4
drivers/staging/csr/csr_wifi_hip_card_sdio.h
View File

@ -300,7 +300,7 @@ typedef struct
u16 packets_interval;
/* Once a queue reaches a stable state, avoid processing */
CsrBool queue_stable[UNIFI_NO_OF_TX_QS];
u8 queue_stable[UNIFI_NO_OF_TX_QS];
} card_dynamic_slot_t;
@ -566,7 +566,7 @@ struct card
u16 sdio_io_block_size;
/* Pad transfer sizes to SDIO block boundaries */
CsrBool sdio_io_block_pad;
u8 sdio_io_block_pad;
/* Read from the XBV */
struct FWOV fwov;

8
drivers/staging/csr/csr_wifi_hip_card_sdio_intr.c
View File

@ -43,7 +43,7 @@
static CsrResult process_bh(card_t *card);
static CsrResult handle_host_protocol(card_t *card, CsrBool *processed_something);
static CsrResult handle_host_protocol(card_t *card, u8 *processed_something);
static CsrResult flush_fh_buffer(card_t *card);
@ -358,7 +358,7 @@ CsrResult unifi_bh(card_t *card, u32 *remaining)
{
CsrResult r;
CsrResult csrResult;
CsrBool pending;
u8 pending;
s32 iostate, j;
const enum unifi_low_power_mode low_power_mode = card->low_power_mode;
u16 data_slots_used = 0;
@ -700,7 +700,7 @@ static CsrResult process_clock_request(card_t *card)
static CsrResult process_bh(card_t *card)
{
CsrResult r;
CsrBool more;
u8 more;
more = FALSE;
/* Process the reasons (interrupt, signals) */
@ -842,7 +842,7 @@ static CsrResult process_bh(card_t *card)
* CSR_RESULT_SUCCESS on success or CSR error code.
* ---------------------------------------------------------------------------
*/
static CsrResult handle_host_protocol(card_t *card, CsrBool *processed_something)
static CsrResult handle_host_protocol(card_t *card, u8 *processed_something)
{
CsrResult r;
s32 done;

8
drivers/staging/csr/csr_wifi_nme_ap_prim.h
View File

@ -78,7 +78,7 @@ typedef u8 CsrWifiNmeApPersCredentialType;
typedef struct
{
u16 apGroupkeyTimeout;
CsrBool apStrictGtkRekey;
u8 apStrictGtkRekey;
u16 apGmkTimeout;
u16 apResponseTimeout;
u8 apRetransLimit;
@ -256,14 +256,14 @@ typedef struct
CsrWifiFsmEvent common;
u16 interfaceTag;
CsrWifiSmeApType apType;
CsrBool cloakSsid;
u8 cloakSsid;
CsrWifiSsid ssid;
CsrWifiSmeRadioIF ifIndex;
u8 channel;
CsrWifiNmeApCredentials apCredentials;
u8 maxConnections;
CsrWifiSmeApP2pGoConfig p2pGoParam;
CsrBool wpsEnabled;
u8 wpsEnabled;
} CsrWifiNmeApStartReq;
/*******************************************************************************
@ -334,7 +334,7 @@ typedef struct
CsrWifiFsmEvent common;
u16 interfaceTag;
CsrWifiMacAddress staMacAddress;
CsrBool keepBlocking;
u8 keepBlocking;
} CsrWifiNmeApStaRemoveReq;
/*******************************************************************************

32
drivers/staging/csr/csr_wifi_nme_ap_serialize.c
View File

@ -33,7 +33,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 104) */
bufferSize += 2; /* u16 primitive->apConfig.apGroupkeyTimeout */
bufferSize += 1; /* CsrBool primitive->apConfig.apStrictGtkRekey */
bufferSize += 1; /* u8 primitive->apConfig.apStrictGtkRekey */
bufferSize += 2; /* u16 primitive->apConfig.apGmkTimeout */
bufferSize += 2; /* u16 primitive->apConfig.apResponseTimeout */
bufferSize += 1; /* u8 primitive->apConfig.apRetransLimit */
@ -44,9 +44,9 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->apMacConfig.supportedRatesCount */
bufferSize += 20; /* u8 primitive->apMacConfig.supportedRates[20] */
bufferSize += 1; /* CsrWifiSmePreambleType primitive->apMacConfig.preamble */
bufferSize += 1; /* CsrBool primitive->apMacConfig.shortSlotTimeEnabled */
bufferSize += 1; /* u8 primitive->apMacConfig.shortSlotTimeEnabled */
bufferSize += 1; /* CsrWifiSmeCtsProtectionType primitive->apMacConfig.ctsProtectionType */
bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmEnabled */
bufferSize += 1; /* u8 primitive->apMacConfig.wmmEnabled */
{
u16 i2;
for (i2 = 0; i2 < 4; i2++)
@ -55,7 +55,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].cwMax */
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].aifs */
bufferSize += 2; /* u16 primitive->apMacConfig.wmmApParams[i2].txopLimit */
bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmApParams[i2].admissionControlMandatory */
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApParams[i2].admissionControlMandatory */
}
}
{
@ -66,7 +66,7 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].cwMax */
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].aifs */
bufferSize += 2; /* u16 primitive->apMacConfig.wmmApBcParams[i2].txopLimit */
bufferSize += 1; /* CsrBool primitive->apMacConfig.wmmApBcParams[i2].admissionControlMandatory */
bufferSize += 1; /* u8 primitive->apMacConfig.wmmApBcParams[i2].admissionControlMandatory */
}
}
bufferSize += 1; /* CsrWifiSmeApAccessType primitive->apMacConfig.accessType */
@ -78,12 +78,12 @@ CsrSize CsrWifiNmeApConfigSetReqSizeof(void *msg)
bufferSize += 6; /* u8 primitive->apMacConfig.macAddressList[i2].a[6] */
}
}
bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.greenfieldSupported */
bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.shortGi20MHz */
bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.greenfieldSupported */
bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.shortGi20MHz */
bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.rxStbc */
bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.rifsModeAllowed */
bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.rifsModeAllowed */
bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.htProtection */
bufferSize += 1; /* CsrBool primitive->apMacConfig.apHtParams.dualCtsProtection */
bufferSize += 1; /* u8 primitive->apMacConfig.apHtParams.dualCtsProtection */
return bufferSize;
}
@ -276,7 +276,7 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 112) */
bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 1; /* CsrWifiSmeApType primitive->apType */
bufferSize += 1; /* CsrBool primitive->cloakSsid */
bufferSize += 1; /* u8 primitive->cloakSsid */
bufferSize += 32; /* u8 primitive->ssid.ssid[32] */
bufferSize += 1; /* u8 primitive->ssid.length */
bufferSize += 1; /* CsrWifiSmeRadioIF primitive->ifIndex */
@ -346,11 +346,11 @@ CsrSize CsrWifiNmeApStartReqSizeof(void *msg)
bufferSize += primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannelCount; /* u8 primitive->p2pGoParam.operatingChanList.channelEntryList[i3].operatingChannel */
}
}
bufferSize += 1; /* CsrBool primitive->p2pGoParam.opPsEnabled */
bufferSize += 1; /* u8 primitive->p2pGoParam.opPsEnabled */
bufferSize += 1; /* u8 primitive->p2pGoParam.ctWindow */
bufferSize += 1; /* CsrWifiSmeP2pNoaConfigMethod primitive->p2pGoParam.noaConfigMethod */
bufferSize += 1; /* CsrBool primitive->p2pGoParam.allowNoaWithNonP2pDevices */
bufferSize += 1; /* CsrBool primitive->wpsEnabled */
bufferSize += 1; /* u8 primitive->p2pGoParam.allowNoaWithNonP2pDevices */
bufferSize += 1; /* u8 primitive->wpsEnabled */
return bufferSize;
}
@ -589,7 +589,7 @@ CsrSize CsrWifiNmeApWmmParamUpdateReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->wmmApParams[i1].cwMax */
bufferSize += 1; /* u8 primitive->wmmApParams[i1].aifs */
bufferSize += 2; /* u16 primitive->wmmApParams[i1].txopLimit */
bufferSize += 1; /* CsrBool primitive->wmmApParams[i1].admissionControlMandatory */
bufferSize += 1; /* u8 primitive->wmmApParams[i1].admissionControlMandatory */
}
}
{
@ -600,7 +600,7 @@ CsrSize CsrWifiNmeApWmmParamUpdateReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].cwMax */
bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].aifs */
bufferSize += 2; /* u16 primitive->wmmApBcParams[i1].txopLimit */
bufferSize += 1; /* CsrBool primitive->wmmApBcParams[i1].admissionControlMandatory */
bufferSize += 1; /* u8 primitive->wmmApBcParams[i1].admissionControlMandatory */
}
}
return bufferSize;
@ -679,7 +679,7 @@ CsrSize CsrWifiNmeApStaRemoveReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 12) */
bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 6; /* u8 primitive->staMacAddress.a[6] */
bufferSize += 1; /* CsrBool primitive->keepBlocking */
bufferSize += 1; /* u8 primitive->keepBlocking */
return bufferSize;
}

4
drivers/staging/csr/csr_wifi_nme_prim.h
View File

@ -720,7 +720,7 @@ typedef struct
char *privateKeyPassword;
u32 sessionLength;
u8 *session;
CsrBool allowPacProvisioning;
u8 allowPacProvisioning;
u32 pacLength;
u8 *pac;
char *pacPassword;
@ -896,7 +896,7 @@ typedef struct
CsrWifiNmeBssType bssType;
u8 channelNo;
u8 ccxOptionsMask;
CsrBool cloakedSsid;
u8 cloakedSsid;
CsrWifiNmeCredentials credentials;
} CsrWifiNmeProfile;

24
drivers/staging/csr/csr_wifi_router_ctrl_prim.h
View File

@ -32,7 +32,7 @@ typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteWrite)(u8 func, u32 address, u8
typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteRead)(u8 func, u32 address, u8 *pdata);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioFirmwareDownload)(u32 length, const u8 *pdata);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioReset)(void);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioCoreDumpPrepare)(CsrBool suspendSme);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioCoreDumpPrepare)(u8 suspendSme);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioByteBlockRead)(u8 func, u32 address, u8 *pdata, u32 length);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpRead16)(u8 func, u32 address, u16 *pdata);
typedef CsrResult (*CsrWifiRouterCtrlRawSdioGpWrite16)(u8 func, u32 address, u16 data);
@ -488,7 +488,7 @@ typedef struct
*******************************************************************************/
typedef struct
{
CsrBool wmmOrQosEnabled;
u8 wmmOrQosEnabled;
CsrWifiRouterCtrlPowersaveTypeMask powersaveMode;
u8 maxSpLength;
u16 listenIntervalInTus;
@ -684,7 +684,7 @@ typedef struct
CsrWifiFsmEvent common;
CsrWifiRouterCtrlRequestorInfo clientData;
CsrWifiRouterCtrlLowPowerMode mode;
CsrBool wakeHost;
u8 wakeHost;
} CsrWifiRouterCtrlConfigurePowerModeReq;
/*******************************************************************************
@ -791,7 +791,7 @@ typedef struct
CsrWifiRouterCtrlPortAction uncontrolledPortAction;
CsrWifiRouterCtrlPortAction controlledPortAction;
CsrWifiMacAddress macAddress;
CsrBool setProtection;
u8 setProtection;
} CsrWifiRouterCtrlPortConfigureReq;
/*******************************************************************************
@ -1073,7 +1073,7 @@ typedef struct
u16 numInterfaceAddress;
CsrWifiMacAddress stationMacAddress[2];
CsrWifiRouterCtrlSmeVersions smeVersions;
CsrBool scheduledInterrupt;
u8 scheduledInterrupt;
} CsrWifiRouterCtrlWifiOnRes;
/*******************************************************************************
@ -1126,8 +1126,8 @@ typedef struct
CsrWifiRouterCtrlRequestorInfo clientData;
CsrWifiRouterCtrlMode mode;
CsrWifiMacAddress bssid;
CsrBool protection;
CsrBool intraBssDistEnabled;
u8 protection;
u8 intraBssDistEnabled;
} CsrWifiRouterCtrlModeSetReq;
/*******************************************************************************
@ -1383,7 +1383,7 @@ typedef struct
{
CsrWifiFsmEvent common;
u16 interfaceTag;
CsrBool isWapiConnected;
u8 isWapiConnected;
} CsrWifiRouterCtrlWapiFilterReq;
/*******************************************************************************
@ -1482,7 +1482,7 @@ typedef struct
{
CsrWifiFsmEvent common;
CsrWifiRouterCtrlRequestorInfo clientData;
CsrBool powerMaintained;
u8 powerMaintained;
} CsrWifiRouterCtrlResumeInd;
/*******************************************************************************
@ -1503,8 +1503,8 @@ typedef struct
{
CsrWifiFsmEvent common;
CsrWifiRouterCtrlRequestorInfo clientData;
CsrBool hardSuspend;
CsrBool d3Suspend;
u8 hardSuspend;
u8 d3Suspend;
} CsrWifiRouterCtrlSuspendInd;
/*******************************************************************************
@ -1802,7 +1802,7 @@ typedef struct
CsrWifiRouterCtrlRequestorInfo clientData;
u16 interfaceTag;
CsrWifiMacAddress peerMacAddress;
CsrBool unicastPdu;
u8 unicastPdu;
} CsrWifiRouterCtrlMicFailureInd;
/*******************************************************************************

18
drivers/staging/csr/csr_wifi_router_ctrl_serialize.c
View File

@ -31,7 +31,7 @@ CsrSize CsrWifiRouterCtrlConfigurePowerModeReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 8) */
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 2; /* CsrWifiRouterCtrlLowPowerMode primitive->mode */
bufferSize += 1; /* CsrBool primitive->wakeHost */
bufferSize += 1; /* u8 primitive->wakeHost */
return bufferSize;
}
@ -284,7 +284,7 @@ CsrSize CsrWifiRouterCtrlPortConfigureReqSizeof(void *msg)
bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->uncontrolledPortAction */
bufferSize += 2; /* CsrWifiRouterCtrlPortAction primitive->controlledPortAction */
bufferSize += 6; /* u8 primitive->macAddress.a[6] */
bufferSize += 1; /* CsrBool primitive->setProtection */
bufferSize += 1; /* u8 primitive->setProtection */
return bufferSize;
}
@ -734,7 +734,7 @@ CsrSize CsrWifiRouterCtrlWifiOnResSizeof(void *msg)
bufferSize += 4; /* u32 primitive->smeVersions.firmwarePatch */
bufferSize += (primitive->smeVersions.smeBuild?CsrStrLen(primitive->smeVersions.smeBuild) : 0) + 1; /* char* primitive->smeVersions.smeBuild (0 byte len + 1 for NULL Term) */
bufferSize += 4; /* u32 primitive->smeVersions.smeHip */
bufferSize += 1; /* CsrBool primitive->scheduledInterrupt */
bufferSize += 1; /* u8 primitive->scheduledInterrupt */
return bufferSize;
}
@ -841,8 +841,8 @@ CsrSize CsrWifiRouterCtrlModeSetReqSizeof(void *msg)
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 1; /* CsrWifiRouterCtrlMode primitive->mode */
bufferSize += 6; /* u8 primitive->bssid.a[6] */
bufferSize += 1; /* CsrBool primitive->protection */
bufferSize += 1; /* CsrBool primitive->intraBssDistEnabled */
bufferSize += 1; /* u8 primitive->protection */
bufferSize += 1; /* u8 primitive->intraBssDistEnabled */
return bufferSize;
}
@ -889,7 +889,7 @@ CsrSize CsrWifiRouterCtrlPeerAddReqSizeof(void *msg)
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */
bufferSize += 2; /* u16 primitive->associationId */
bufferSize += 1; /* CsrBool primitive->staInfo.wmmOrQosEnabled */
bufferSize += 1; /* u8 primitive->staInfo.wmmOrQosEnabled */
bufferSize += 2; /* CsrWifiRouterCtrlPowersaveTypeMask primitive->staInfo.powersaveMode */
bufferSize += 1; /* u8 primitive->staInfo.maxSpLength */
bufferSize += 2; /* u16 primitive->staInfo.listenIntervalInTus */
@ -1467,8 +1467,8 @@ CsrSize CsrWifiRouterCtrlSuspendIndSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 7) */
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 1; /* CsrBool primitive->hardSuspend */
bufferSize += 1; /* CsrBool primitive->d3Suspend */
bufferSize += 1; /* u8 primitive->hardSuspend */
bufferSize += 1; /* u8 primitive->d3Suspend */
return bufferSize;
}
@ -1969,7 +1969,7 @@ CsrSize CsrWifiRouterCtrlMicFailureIndSizeof(void *msg)
bufferSize += 2; /* CsrWifiRouterCtrlRequestorInfo primitive->clientData */
bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 6; /* u8 primitive->peerMacAddress.a[6] */
bufferSize += 1; /* CsrBool primitive->unicastPdu */
bufferSize += 1; /* u8 primitive->unicastPdu */
return bufferSize;
}

2
drivers/staging/csr/csr_wifi_router_prim.h
View File

@ -249,7 +249,7 @@ typedef struct
CsrWifiRouterFrameFreeFunction freeFunction;
CsrWifiRouterPriority priority;
u32 hostTag;
CsrBool cfmRequested;
u8 cfmRequested;
} CsrWifiRouterMaPacketReq;
/*******************************************************************************

2
drivers/staging/csr/csr_wifi_router_serialize.c
View File

@ -79,7 +79,7 @@ CsrSize CsrWifiRouterMaPacketReqSizeof(void *msg)
bufferSize += 4; /* CsrWifiRouterFrameFreeFunction primitive->freeFunction */
bufferSize += 2; /* CsrWifiRouterPriority primitive->priority */
bufferSize += 4; /* u32 primitive->hostTag */
bufferSize += 1; /* CsrBool primitive->cfmRequested */
bufferSize += 1; /* u8 primitive->cfmRequested */
return bufferSize;
}

22
drivers/staging/csr/csr_wifi_sme_ap_prim.h
View File

@ -248,12 +248,12 @@ typedef u16 CsrWifiSmeApWapiCapabilitiesMask;
*******************************************************************************/
typedef struct
{
CsrBool greenfieldSupported;
CsrBool shortGi20MHz;
u8 greenfieldSupported;
u8 shortGi20MHz;
u8 rxStbc;
CsrBool rifsModeAllowed;
u8 rifsModeAllowed;
u8 htProtection;
CsrBool dualCtsProtection;
u8 dualCtsProtection;
} CsrWifiSmeApHtParams;
/*******************************************************************************
@ -389,9 +389,9 @@ typedef struct
u8 supportedRatesCount;
u8 supportedRates[20];
CsrWifiSmePreambleType preamble;
CsrBool shortSlotTimeEnabled;
u8 shortSlotTimeEnabled;
CsrWifiSmeCtsProtectionType ctsProtectionType;
CsrBool wmmEnabled;
u8 wmmEnabled;
CsrWifiSmeWmmAcParams wmmApParams[4];
CsrWifiSmeWmmAcParams wmmApBcParams[4];
CsrWifiSmeApAccessType accessType;
@ -435,10 +435,10 @@ typedef struct
{
CsrWifiSmeP2pGroupCapabilityMask groupCapability;
CsrWifiSmeApP2pOperatingChanList operatingChanList;
CsrBool opPsEnabled;
u8 opPsEnabled;
u8 ctWindow;
CsrWifiSmeP2pNoaConfigMethod noaConfigMethod;
CsrBool allowNoaWithNonP2pDevices;
u8 allowNoaWithNonP2pDevices;
} CsrWifiSmeApP2pGoConfig;
/*******************************************************************************
@ -481,7 +481,7 @@ typedef struct
typedef struct
{
CsrWifiSmeApCredentials apCredentials;
CsrBool wpsEnabled;
u8 wpsEnabled;
} CsrWifiSmeApSecConfig;
@ -553,7 +553,7 @@ typedef struct
u16 interfaceTag;
u8 initialPresence;
CsrWifiSmeApType apType;
CsrBool cloakSsid;
u8 cloakSsid;
CsrWifiSsid ssid;
CsrWifiSmeRadioIF ifIndex;
u8 channel;
@ -675,7 +675,7 @@ typedef struct
CsrWifiSmeIEEE80211Reason deauthReason;
CsrWifiSmeIEEE80211Reason disassocReason;
CsrWifiMacAddress peerMacaddress;
CsrBool keepBlocking;
u8 keepBlocking;
} CsrWifiSmeApStaDisconnectReq;
/*******************************************************************************

58
drivers/staging/csr/csr_wifi_sme_prim.h
View File

@ -1988,9 +1988,9 @@ typedef struct
typedef struct
{
u8 keepAliveTimeMs;
CsrBool apRoamingEnabled;
u8 apRoamingEnabled;
u8 measurementsMask;
CsrBool ccxRadioMgtEnabled;
u8 ccxRadioMgtEnabled;
} CsrWifiSmeCcxConfig;
/*******************************************************************************
@ -2037,8 +2037,8 @@ typedef struct
*******************************************************************************/
typedef struct
{
CsrBool coexEnableSchemeManagement;
CsrBool coexPeriodicWakeHost;
u8 coexEnableSchemeManagement;
u8 coexPeriodicWakeHost;
u16 coexTrafficBurstyLatencyMs;
u16 coexTrafficContinuousLatencyMs;
u16 coexObexBlackoutDurationMs;
@ -2231,7 +2231,7 @@ typedef struct
*******************************************************************************/
typedef struct
{
CsrBool unifiFixMaxTxDataRate;
u8 unifiFixMaxTxDataRate;
u8 unifiFixTxDataRate;
u16 dot11RtsThreshold;
u16 dot11FragmentationThreshold;
@ -2294,7 +2294,7 @@ typedef struct
typedef struct
{
CsrWifiMacAddress bssid;
CsrBool preAuthAllowed;
u8 preAuthAllowed;
} CsrWifiSmePmkidCandidate;
/*******************************************************************************
@ -2339,8 +2339,8 @@ typedef struct
*******************************************************************************/
typedef struct
{
CsrBool dot11MultiDomainCapabilityImplemented;
CsrBool dot11MultiDomainCapabilityEnabled;
u8 dot11MultiDomainCapabilityImplemented;
u8 dot11MultiDomainCapabilityEnabled;
CsrWifiSmeRegulatoryDomain currentRegulatoryDomain;
u8 currentCountryCode[2];
} CsrWifiSmeRegulatoryDomainInfo;
@ -2489,7 +2489,7 @@ typedef struct
u8 cwMax;
u8 aifs;
u16 txopLimit;
CsrBool admissionControlMandatory;
u8 admissionControlMandatory;
} CsrWifiSmeWmmAcParams;
/*******************************************************************************
@ -2523,7 +2523,7 @@ typedef struct
*******************************************************************************/
typedef struct
{
CsrBool spportWps;
u8 spportWps;
u8 deviceType;
} CsrWifiSmeWpsDeviceTypeCommon;
@ -2596,13 +2596,13 @@ typedef struct
*******************************************************************************/
typedef struct
{
CsrBool hasTrafficData;
u8 hasTrafficData;
CsrWifiSmeTrafficType currentTrafficType;
u16 currentPeriodMs;
CsrWifiSmePowerSaveLevel currentPowerSave;
u16 currentCoexPeriodMs;
u16 currentCoexLatencyMs;
CsrBool hasBtDevice;
u8 hasBtDevice;
u32 currentBlackoutDurationUs;
u32 currentBlackoutPeriodUs;
CsrWifiSmeCoexScheme currentCoexScheme;
@ -2677,7 +2677,7 @@ typedef struct
u16 mlmeAssociateReqInformationElementsLength;
u8 *mlmeAssociateReqInformationElements;
CsrWifiSmeWmmQosInfoMask wmmQosInfo;
CsrBool adhocJoinOnly;
u8 adhocJoinOnly;
u8 adhocChannel;
} CsrWifiSmeConnectionConfig;
@ -2756,7 +2756,7 @@ typedef struct
CsrWifiSmeRadioIF ifIndex;
u16 atimWindowTu;
u16 beaconPeriodTu;
CsrBool reassociation;
u8 reassociation;
u16 beaconFrameLength;
u8 *beaconFrame;
u16 associationReqFrameLength;
@ -2800,7 +2800,7 @@ typedef struct
CsrWifiSme80211dTrustLevel trustLevel;
u8 countryCode[2];
CsrWifiSmeFirmwareDriverInterface firmwareDriverInterface;
CsrBool enableStrictDraftN;
u8 enableStrictDraftN;
} CsrWifiSmeDeviceConfig;
/*******************************************************************************
@ -2925,9 +2925,9 @@ typedef struct
{
CsrWifiSmeKeyType keyType;
u8 keyIndex;
CsrBool wepTxKey;
u8 wepTxKey;
u16 keyRsc[8];
CsrBool authenticator;
u8 authenticator;
CsrWifiMacAddress address;
u8 keyLength;
u8 key[32];
@ -3001,11 +3001,11 @@ typedef struct
{
CsrWifiSmePowerSaveLevel powerSaveLevel;
u16 listenIntervalTu;
CsrBool rxDtims;
u8 rxDtims;
CsrWifiSmeD3AutoScanMode d3AutoScanMode;
u8 clientTrafficWindow;
CsrBool opportunisticPowerSave;
CsrBool noticeOfAbsence;
u8 opportunisticPowerSave;
u8 noticeOfAbsence;
} CsrWifiSmePowerConfig;
/*******************************************************************************
@ -3039,8 +3039,8 @@ typedef struct
typedef struct
{
CsrWifiSmeRoamingBandData roamingBands[3];
CsrBool disableSmoothRoaming;
CsrBool disableRoamScans;
u8 disableSmoothRoaming;
u8 disableRoamScans;
u8 reconnectLimit;
u16 reconnectLimitIntervalMs;
CsrWifiSmeScanConfigData roamScanCfg[3];
@ -3085,7 +3085,7 @@ typedef struct
typedef struct
{
CsrWifiSmeScanConfigData scanCfg[4];
CsrBool disableAutonomousScans;
u8 disableAutonomousScans;
u16 maxResults;
s8 highRssiThreshold;
s8 lowRssiThreshold;
@ -3193,8 +3193,8 @@ typedef struct
u8 connectionQualitySnrChangeTrigger;
CsrWifiSmeWmmModeMask wmmModeMask;
CsrWifiSmeRadioIF ifIndex;
CsrBool allowUnicastUseGroupCipher;
CsrBool enableOpportunisticKeyCaching;
u8 allowUnicastUseGroupCipher;
u8 enableOpportunisticKeyCaching;
} CsrWifiSmeStaConfig;
/*******************************************************************************
@ -4401,7 +4401,7 @@ typedef struct
u8 ssidCount;
CsrWifiSsid *ssid;
CsrWifiMacAddress bssid;
CsrBool forceScan;
u8 forceScan;
CsrWifiSmeBssType bssType;
CsrWifiSmeScanType scanType;
u16 channelListCount;
@ -4561,7 +4561,7 @@ typedef struct
u16 interfaceTag;
CsrWifiSmeListAction action;
u32 transactionId;
CsrBool strict;
u8 strict;
CsrWifiSmeTspecCtrlMask ctrlMask;
u16 tspecLength;
u8 *tspec;
@ -5383,7 +5383,7 @@ typedef struct
{
CsrWifiFsmEvent common;
CsrWifiMacAddress address;
CsrBool isconnected;
u8 isconnected;
} CsrWifiSmeIbssStationInd;
/*******************************************************************************
@ -5608,7 +5608,7 @@ typedef struct
{
CsrWifiFsmEvent common;
u16 interfaceTag;
CsrBool secondFailure;
u8 secondFailure;
u16 count;
CsrWifiMacAddress address;
CsrWifiSmeKeyType keyType;

88
drivers/staging/csr/csr_wifi_sme_serialize.c
View File

@ -203,9 +203,9 @@ CsrSize CsrWifiSmeCcxConfigSetReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 9) */
bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 1; /* u8 primitive->ccxConfig.keepAliveTimeMs */
bufferSize += 1; /* CsrBool primitive->ccxConfig.apRoamingEnabled */
bufferSize += 1; /* u8 primitive->ccxConfig.apRoamingEnabled */
bufferSize += 1; /* u8 primitive->ccxConfig.measurementsMask */
bufferSize += 1; /* CsrBool primitive->ccxConfig.ccxRadioMgtEnabled */
bufferSize += 1; /* u8 primitive->ccxConfig.ccxRadioMgtEnabled */
return bufferSize;
}
@ -246,8 +246,8 @@ CsrSize CsrWifiSmeCoexConfigSetReqSizeof(void *msg)
CsrSize bufferSize = 2;
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 29) */
bufferSize += 1; /* CsrBool primitive->coexConfig.coexEnableSchemeManagement */
bufferSize += 1; /* CsrBool primitive->coexConfig.coexPeriodicWakeHost */
bufferSize += 1; /* u8 primitive->coexConfig.coexEnableSchemeManagement */
bufferSize += 1; /* u8 primitive->coexConfig.coexPeriodicWakeHost */
bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficBurstyLatencyMs */
bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficContinuousLatencyMs */
bufferSize += 2; /* u16 primitive->coexConfig.coexObexBlackoutDurationMs */
@ -331,7 +331,7 @@ CsrSize CsrWifiSmeConnectReqSizeof(void *msg)
bufferSize += 2; /* u16 primitive->connectionConfig.mlmeAssociateReqInformationElementsLength */
bufferSize += primitive->connectionConfig.mlmeAssociateReqInformationElementsLength; /* u8 primitive->connectionConfig.mlmeAssociateReqInformationElements */
bufferSize += 1; /* CsrWifiSmeWmmQosInfoMask primitive->connectionConfig.wmmQosInfo */
bufferSize += 1; /* CsrBool primitive->connectionConfig.adhocJoinOnly */
bufferSize += 1; /* u8 primitive->connectionConfig.adhocJoinOnly */
bufferSize += 1; /* u8 primitive->connectionConfig.adhocChannel */
return bufferSize;
}
@ -453,7 +453,7 @@ CsrSize CsrWifiSmeKeyReqSizeof(void *msg)
bufferSize += 1; /* CsrWifiSmeListAction primitive->action */
bufferSize += 1; /* CsrWifiSmeKeyType primitive->key.keyType */
bufferSize += 1; /* u8 primitive->key.keyIndex */
bufferSize += 1; /* CsrBool primitive->key.wepTxKey */
bufferSize += 1; /* u8 primitive->key.wepTxKey */
{
u16 i2;
for (i2 = 0; i2 < 8; i2++)
@ -461,7 +461,7 @@ CsrSize CsrWifiSmeKeyReqSizeof(void *msg)
bufferSize += 2; /* u16 primitive->key.keyRsc[8] */
}
}
bufferSize += 1; /* CsrBool primitive->key.authenticator */
bufferSize += 1; /* u8 primitive->key.authenticator */
bufferSize += 6; /* u8 primitive->key.address.a[6] */
bufferSize += 1; /* u8 primitive->key.keyLength */
bufferSize += 32; /* u8 primitive->key.key[32] */
@ -527,7 +527,7 @@ CsrSize CsrWifiSmeMibConfigSetReqSizeof(void *msg)
CsrSize bufferSize = 2;
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */
bufferSize += 1; /* CsrBool primitive->mibConfig.unifiFixMaxTxDataRate */
bufferSize += 1; /* u8 primitive->mibConfig.unifiFixMaxTxDataRate */
bufferSize += 1; /* u8 primitive->mibConfig.unifiFixTxDataRate */
bufferSize += 2; /* u16 primitive->mibConfig.dot11RtsThreshold */
bufferSize += 2; /* u16 primitive->mibConfig.dot11FragmentationThreshold */
@ -958,11 +958,11 @@ CsrSize CsrWifiSmePowerConfigSetReqSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 11) */
bufferSize += 1; /* CsrWifiSmePowerSaveLevel primitive->powerConfig.powerSaveLevel */
bufferSize += 2; /* u16 primitive->powerConfig.listenIntervalTu */
bufferSize += 1; /* CsrBool primitive->powerConfig.rxDtims */
bufferSize += 1; /* u8 primitive->powerConfig.rxDtims */
bufferSize += 1; /* CsrWifiSmeD3AutoScanMode primitive->powerConfig.d3AutoScanMode */
bufferSize += 1; /* u8 primitive->powerConfig.clientTrafficWindow */
bufferSize += 1; /* CsrBool primitive->powerConfig.opportunisticPowerSave */
bufferSize += 1; /* CsrBool primitive->powerConfig.noticeOfAbsence */
bufferSize += 1; /* u8 primitive->powerConfig.opportunisticPowerSave */
bufferSize += 1; /* u8 primitive->powerConfig.noticeOfAbsence */
return bufferSize;
}
@ -1018,8 +1018,8 @@ CsrSize CsrWifiSmeRoamingConfigSetReqSizeof(void *msg)
bufferSize += 2; /* s16 primitive->roamingConfig.roamingBands[i2].snrLowThreshold */
}
}
bufferSize += 1; /* CsrBool primitive->roamingConfig.disableSmoothRoaming */
bufferSize += 1; /* CsrBool primitive->roamingConfig.disableRoamScans */
bufferSize += 1; /* u8 primitive->roamingConfig.disableSmoothRoaming */
bufferSize += 1; /* u8 primitive->roamingConfig.disableRoamScans */
bufferSize += 1; /* u8 primitive->roamingConfig.reconnectLimit */
bufferSize += 2; /* u16 primitive->roamingConfig.reconnectLimitIntervalMs */
{
@ -1131,7 +1131,7 @@ CsrSize CsrWifiSmeScanConfigSetReqSizeof(void *msg)
bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu */
}
}
bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */
bufferSize += 1; /* u8 primitive->scanConfig.disableAutonomousScans */
bufferSize += 2; /* u16 primitive->scanConfig.maxResults */
bufferSize += 1; /* s8 primitive->scanConfig.highRssiThreshold */
bufferSize += 1; /* s8 primitive->scanConfig.lowRssiThreshold */
@ -1245,7 +1245,7 @@ CsrSize CsrWifiSmeScanFullReqSizeof(void *msg)
}
}
bufferSize += 6; /* u8 primitive->bssid.a[6] */
bufferSize += 1; /* CsrBool primitive->forceScan */
bufferSize += 1; /* u8 primitive->forceScan */
bufferSize += 1; /* CsrWifiSmeBssType primitive->bssType */
bufferSize += 1; /* CsrWifiSmeScanType primitive->scanType */
bufferSize += 2; /* u16 primitive->channelListCount */
@ -1358,8 +1358,8 @@ CsrSize CsrWifiSmeSmeStaConfigSetReqSizeof(void *msg)
bufferSize += 1; /* u8 primitive->smeConfig.connectionQualitySnrChangeTrigger */
bufferSize += 1; /* CsrWifiSmeWmmModeMask primitive->smeConfig.wmmModeMask */
bufferSize += 1; /* CsrWifiSmeRadioIF primitive->smeConfig.ifIndex */
bufferSize += 1; /* CsrBool primitive->smeConfig.allowUnicastUseGroupCipher */
bufferSize += 1; /* CsrBool primitive->smeConfig.enableOpportunisticKeyCaching */
bufferSize += 1; /* u8 primitive->smeConfig.allowUnicastUseGroupCipher */
bufferSize += 1; /* u8 primitive->smeConfig.enableOpportunisticKeyCaching */
return bufferSize;
}
@ -1408,7 +1408,7 @@ CsrSize CsrWifiSmeTspecReqSizeof(void *msg)
bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 1; /* CsrWifiSmeListAction primitive->action */
bufferSize += 4; /* u32 primitive->transactionId */
bufferSize += 1; /* CsrBool primitive->strict */
bufferSize += 1; /* u8 primitive->strict */
bufferSize += 1; /* CsrWifiSmeTspecCtrlMask primitive->ctrlMask */
bufferSize += 2; /* u16 primitive->tspecLength */
bufferSize += primitive->tspecLength; /* u8 primitive->tspec */
@ -1751,7 +1751,7 @@ CsrSize CsrWifiSmeSmeCommonConfigSetReqSizeof(void *msg)
bufferSize += 1; /* CsrWifiSme80211dTrustLevel primitive->deviceConfig.trustLevel */
bufferSize += 2; /* u8 primitive->deviceConfig.countryCode[2] */
bufferSize += 1; /* CsrWifiSmeFirmwareDriverInterface primitive->deviceConfig.firmwareDriverInterface */
bufferSize += 1; /* CsrBool primitive->deviceConfig.enableStrictDraftN */
bufferSize += 1; /* u8 primitive->deviceConfig.enableStrictDraftN */
return bufferSize;
}
@ -2019,7 +2019,7 @@ CsrSize CsrWifiSmeAssociationCompleteIndSizeof(void *msg)
bufferSize += 1; /* CsrWifiSmeRadioIF primitive->connectionInfo.ifIndex */
bufferSize += 2; /* u16 primitive->connectionInfo.atimWindowTu */
bufferSize += 2; /* u16 primitive->connectionInfo.beaconPeriodTu */
bufferSize += 1; /* CsrBool primitive->connectionInfo.reassociation */
bufferSize += 1; /* u8 primitive->connectionInfo.reassociation */
bufferSize += 2; /* u16 primitive->connectionInfo.beaconFrameLength */
bufferSize += primitive->connectionInfo.beaconFrameLength; /* u8 primitive->connectionInfo.beaconFrame */
bufferSize += 2; /* u16 primitive->connectionInfo.associationReqFrameLength */
@ -2397,9 +2397,9 @@ CsrSize CsrWifiSmeCcxConfigGetCfmSizeof(void *msg)
bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 2; /* CsrResult primitive->status */
bufferSize += 1; /* u8 primitive->ccxConfig.keepAliveTimeMs */
bufferSize += 1; /* CsrBool primitive->ccxConfig.apRoamingEnabled */
bufferSize += 1; /* u8 primitive->ccxConfig.apRoamingEnabled */
bufferSize += 1; /* u8 primitive->ccxConfig.measurementsMask */
bufferSize += 1; /* CsrBool primitive->ccxConfig.ccxRadioMgtEnabled */
bufferSize += 1; /* u8 primitive->ccxConfig.ccxRadioMgtEnabled */
return bufferSize;
}
@ -2479,8 +2479,8 @@ CsrSize CsrWifiSmeCoexConfigGetCfmSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 31) */
bufferSize += 2; /* CsrResult primitive->status */
bufferSize += 1; /* CsrBool primitive->coexConfig.coexEnableSchemeManagement */
bufferSize += 1; /* CsrBool primitive->coexConfig.coexPeriodicWakeHost */
bufferSize += 1; /* u8 primitive->coexConfig.coexEnableSchemeManagement */
bufferSize += 1; /* u8 primitive->coexConfig.coexPeriodicWakeHost */
bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficBurstyLatencyMs */
bufferSize += 2; /* u16 primitive->coexConfig.coexTrafficContinuousLatencyMs */
bufferSize += 2; /* u16 primitive->coexConfig.coexObexBlackoutDurationMs */
@ -2554,13 +2554,13 @@ CsrSize CsrWifiSmeCoexInfoGetCfmSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 24) */
bufferSize += 2; /* CsrResult primitive->status */
bufferSize += 1; /* CsrBool primitive->coexInfo.hasTrafficData */
bufferSize += 1; /* u8 primitive->coexInfo.hasTrafficData */
bufferSize += 1; /* CsrWifiSmeTrafficType primitive->coexInfo.currentTrafficType */
bufferSize += 2; /* u16 primitive->coexInfo.currentPeriodMs */
bufferSize += 1; /* CsrWifiSmePowerSaveLevel primitive->coexInfo.currentPowerSave */
bufferSize += 2; /* u16 primitive->coexInfo.currentCoexPeriodMs */
bufferSize += 2; /* u16 primitive->coexInfo.currentCoexLatencyMs */
bufferSize += 1; /* CsrBool primitive->coexInfo.hasBtDevice */
bufferSize += 1; /* u8 primitive->coexInfo.hasBtDevice */
bufferSize += 4; /* u32 primitive->coexInfo.currentBlackoutDurationUs */
bufferSize += 4; /* u32 primitive->coexInfo.currentBlackoutPeriodUs */
bufferSize += 1; /* CsrWifiSmeCoexScheme primitive->coexInfo.currentCoexScheme */
@ -2666,7 +2666,7 @@ CsrSize CsrWifiSmeConnectionConfigGetCfmSizeof(void *msg)
bufferSize += 2; /* u16 primitive->connectionConfig.mlmeAssociateReqInformationElementsLength */
bufferSize += primitive->connectionConfig.mlmeAssociateReqInformationElementsLength; /* u8 primitive->connectionConfig.mlmeAssociateReqInformationElements */
bufferSize += 1; /* CsrWifiSmeWmmQosInfoMask primitive->connectionConfig.wmmQosInfo */
bufferSize += 1; /* CsrBool primitive->connectionConfig.adhocJoinOnly */
bufferSize += 1; /* u8 primitive->connectionConfig.adhocJoinOnly */
bufferSize += 1; /* u8 primitive->connectionConfig.adhocChannel */
return bufferSize;
}
@ -2762,7 +2762,7 @@ CsrSize CsrWifiSmeConnectionInfoGetCfmSizeof(void *msg)
bufferSize += 1; /* CsrWifiSmeRadioIF primitive->connectionInfo.ifIndex */
bufferSize += 2; /* u16 primitive->connectionInfo.atimWindowTu */
bufferSize += 2; /* u16 primitive->connectionInfo.beaconPeriodTu */
bufferSize += 1; /* CsrBool primitive->connectionInfo.reassociation */
bufferSize += 1; /* u8 primitive->connectionInfo.reassociation */
bufferSize += 2; /* u16 primitive->connectionInfo.beaconFrameLength */
bufferSize += primitive->connectionInfo.beaconFrameLength; /* u8 primitive->connectionInfo.beaconFrame */
bufferSize += 2; /* u16 primitive->connectionInfo.associationReqFrameLength */
@ -3221,7 +3221,7 @@ CsrSize CsrWifiSmeIbssStationIndSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */
bufferSize += 6; /* u8 primitive->address.a[6] */
bufferSize += 1; /* CsrBool primitive->isconnected */
bufferSize += 1; /* u8 primitive->isconnected */
return bufferSize;
}
@ -3358,7 +3358,7 @@ CsrSize CsrWifiSmeMediaStatusIndSizeof(void *msg)
bufferSize += 1; /* CsrWifiSmeRadioIF primitive->connectionInfo.ifIndex */
bufferSize += 2; /* u16 primitive->connectionInfo.atimWindowTu */
bufferSize += 2; /* u16 primitive->connectionInfo.beaconPeriodTu */
bufferSize += 1; /* CsrBool primitive->connectionInfo.reassociation */
bufferSize += 1; /* u8 primitive->connectionInfo.reassociation */
bufferSize += 2; /* u16 primitive->connectionInfo.beaconFrameLength */
bufferSize += primitive->connectionInfo.beaconFrameLength; /* u8 primitive->connectionInfo.beaconFrame */
bufferSize += 2; /* u16 primitive->connectionInfo.associationReqFrameLength */
@ -3559,7 +3559,7 @@ CsrSize CsrWifiSmeMibConfigGetCfmSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 13) */
bufferSize += 2; /* CsrResult primitive->status */
bufferSize += 1; /* CsrBool primitive->mibConfig.unifiFixMaxTxDataRate */
bufferSize += 1; /* u8 primitive->mibConfig.unifiFixMaxTxDataRate */
bufferSize += 1; /* u8 primitive->mibConfig.unifiFixTxDataRate */
bufferSize += 2; /* u16 primitive->mibConfig.dot11RtsThreshold */
bufferSize += 2; /* u16 primitive->mibConfig.dot11FragmentationThreshold */
@ -3725,7 +3725,7 @@ CsrSize CsrWifiSmeMicFailureIndSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 15) */
bufferSize += 2; /* u16 primitive->interfaceTag */
bufferSize += 1; /* CsrBool primitive->secondFailure */
bufferSize += 1; /* u8 primitive->secondFailure */
bufferSize += 2; /* u16 primitive->count */
bufferSize += 6; /* u8 primitive->address.a[6] */
bufferSize += 1; /* CsrWifiSmeKeyType primitive->keyType */
@ -3926,7 +3926,7 @@ CsrSize CsrWifiSmePmkidCandidateListIndSizeof(void *msg)
for (i1 = 0; i1 < primitive->pmkidCandidatesCount; i1++)
{
bufferSize += 6; /* u8 primitive->pmkidCandidates[i1].bssid.a[6] */
bufferSize += 1; /* CsrBool primitive->pmkidCandidates[i1].preAuthAllowed */
bufferSize += 1; /* u8 primitive->pmkidCandidates[i1].preAuthAllowed */
}
}
return bufferSize;
@ -4075,11 +4075,11 @@ CsrSize CsrWifiSmePowerConfigGetCfmSizeof(void *msg)
bufferSize += 2; /* CsrResult primitive->status */
bufferSize += 1; /* CsrWifiSmePowerSaveLevel primitive->powerConfig.powerSaveLevel */
bufferSize += 2; /* u16 primitive->powerConfig.listenIntervalTu */
bufferSize += 1; /* CsrBool primitive->powerConfig.rxDtims */
bufferSize += 1; /* u8 primitive->powerConfig.rxDtims */
bufferSize += 1; /* CsrWifiSmeD3AutoScanMode primitive->powerConfig.d3AutoScanMode */
bufferSize += 1; /* u8 primitive->powerConfig.clientTrafficWindow */
bufferSize += 1; /* CsrBool primitive->powerConfig.opportunisticPowerSave */
bufferSize += 1; /* CsrBool primitive->powerConfig.noticeOfAbsence */
bufferSize += 1; /* u8 primitive->powerConfig.opportunisticPowerSave */
bufferSize += 1; /* u8 primitive->powerConfig.noticeOfAbsence */
return bufferSize;
}
@ -4127,8 +4127,8 @@ CsrSize CsrWifiSmeRegulatoryDomainInfoGetCfmSizeof(void *msg)
/* Calculate the Size of the Serialised Data. Could be more efficient (Try 10) */
bufferSize += 2; /* CsrResult primitive->status */
bufferSize += 1; /* CsrBool primitive->regDomInfo.dot11MultiDomainCapabilityImplemented */
bufferSize += 1; /* CsrBool primitive->regDomInfo.dot11MultiDomainCapabilityEnabled */
bufferSize += 1; /* u8 primitive->regDomInfo.dot11MultiDomainCapabilityImplemented */
bufferSize += 1; /* u8 primitive->regDomInfo.dot11MultiDomainCapabilityEnabled */
bufferSize += 1; /* CsrWifiSmeRegulatoryDomain primitive->regDomInfo.currentRegulatoryDomain */
bufferSize += 2; /* u8 primitive->regDomInfo.currentCountryCode[2] */
return bufferSize;
@ -4258,8 +4258,8 @@ CsrSize CsrWifiSmeRoamingConfigGetCfmSizeof(void *msg)
bufferSize += 2; /* s16 primitive->roamingConfig.roamingBands[i2].snrLowThreshold */
}
}
bufferSize += 1; /* CsrBool primitive->roamingConfig.disableSmoothRoaming */
bufferSize += 1; /* CsrBool primitive->roamingConfig.disableRoamScans */
bufferSize += 1; /* u8 primitive->roamingConfig.disableSmoothRoaming */
bufferSize += 1; /* u8 primitive->roamingConfig.disableRoamScans */
bufferSize += 1; /* u8 primitive->roamingConfig.reconnectLimit */
bufferSize += 2; /* u16 primitive->roamingConfig.reconnectLimitIntervalMs */
{
@ -4410,7 +4410,7 @@ CsrSize CsrWifiSmeScanConfigGetCfmSizeof(void *msg)
bufferSize += 2; /* u16 primitive->scanConfig.scanCfg[i2].maxPassiveChannelTimeTu */
}
}
bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */
bufferSize += 1; /* u8 primitive->scanConfig.disableAutonomousScans */
bufferSize += 2; /* u16 primitive->scanConfig.maxResults */
bufferSize += 1; /* s8 primitive->scanConfig.highRssiThreshold */
bufferSize += 1; /* s8 primitive->scanConfig.lowRssiThreshold */
@ -5143,8 +5143,8 @@ CsrSize CsrWifiSmeSmeStaConfigGetCfmSizeof(void *msg)
bufferSize += 1; /* u8 primitive->smeConfig.connectionQualitySnrChangeTrigger */
bufferSize += 1; /* CsrWifiSmeWmmModeMask primitive->smeConfig.wmmModeMask */
bufferSize += 1; /* CsrWifiSmeRadioIF primitive->smeConfig.ifIndex */
bufferSize += 1; /* CsrBool primitive->smeConfig.allowUnicastUseGroupCipher */
bufferSize += 1; /* CsrBool primitive->smeConfig.enableOpportunisticKeyCaching */
bufferSize += 1; /* u8 primitive->smeConfig.allowUnicastUseGroupCipher */
bufferSize += 1; /* u8 primitive->smeConfig.enableOpportunisticKeyCaching */
return bufferSize;
}
@ -5595,7 +5595,7 @@ CsrSize CsrWifiSmeSmeCommonConfigGetCfmSizeof(void *msg)
bufferSize += 1; /* CsrWifiSme80211dTrustLevel primitive->deviceConfig.trustLevel */
bufferSize += 2; /* u8 primitive->deviceConfig.countryCode[2] */
bufferSize += 1; /* CsrWifiSmeFirmwareDriverInterface primitive->deviceConfig.firmwareDriverInterface */
bufferSize += 1; /* CsrBool primitive->deviceConfig.enableStrictDraftN */
bufferSize += 1; /* u8 primitive->deviceConfig.enableStrictDraftN */
return bufferSize;
}

8
drivers/staging/csr/csr_wifi_vif_utils.h
View File

@ -64,9 +64,9 @@ extern "C" {
* @param[in] CsrWifiInterfaceMode : mode
*
* @return
* CsrBool : returns true if the interface is allowed to operate in the mode otherwise false.
* u8 : returns true if the interface is allowed to operate in the mode otherwise false.
*/
extern CsrBool CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability,
extern u8 CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapability,
u8 *currentInterfaceModes,
u16 interfaceTag,
CsrWifiInterfaceMode mode);
@ -80,9 +80,9 @@ extern CsrBool CsrWifiVifUtilsCheckCompatibility(u8 interfaceCapabil
* @param[in] u16 : interfaceTag
*
* @return
* CsrBool : returns true if the interface is supported, otherwise false.
* u8 : returns true if the interface is supported, otherwise false.
*/
extern CsrBool CsrWifiVifUtilsIsSupported(u16 interfaceTag);
extern u8 CsrWifiVifUtilsIsSupported(u16 interfaceTag);
#ifdef CSR_LOG_ENABLE
/**

2
drivers/staging/csr/firmware.c
View File

@ -296,7 +296,7 @@ uf_run_unifihelper(unifi_priv_t *priv)
} /* uf_run_unifihelper() */
#ifdef CSR_WIFI_SPLIT_PATCH
static CsrBool is_ap_mode(unifi_priv_t *priv)
static u8 is_ap_mode(unifi_priv_t *priv)
{
if (priv == NULL || priv->interfacePriv[0] == NULL)
{

10
drivers/staging/csr/netdev.c
View File

@ -552,7 +552,7 @@ uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id)
* and should be freed by freeing the net_device pointer.
* ---------------------------------------------------------------------------
*/
CsrBool
u8
uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag)
{
struct net_device *dev;
@ -1371,7 +1371,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk
u16 interfaceTag,
const u8 *daddr,
const u8 *saddr,
CsrBool protection)
u8 protection)
{
u16 fc = 0;
u8 qc = 0;
@ -1382,7 +1382,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv, struct sk_buff *skb, struct sk
u8 direction = 0;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
u8 *addressOne;
CsrBool bQosNull = false;
u8 bQosNull = false;
if (skb == NULL) {
unifi_error(priv,"prepare_and_add_macheader: Invalid SKB reference\n");
@ -1650,7 +1650,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr
{
int r;
u16 i;
CsrBool eapolStore = FALSE;
u8 eapolStore = FALSE;
struct sk_buff *newSkb = NULL;
bulk_data_param_t bulkdata;
const int proto = ntohs(ehdr->h_proto);
@ -2745,7 +2745,7 @@ static void process_ma_packet_ind(unifi_priv_t *priv, CSR_SIGNAL *signal, bulk_d
#ifdef CSR_SUPPORT_SME
u8 dataFrameType = 0;
CsrBool powerSaveChanged = FALSE;
u8 powerSaveChanged = FALSE;
u8 pmBit = 0;
CsrWifiRouterCtrlStaInfo_t *srcStaInfo = NULL;
u16 qosControl;

2
drivers/staging/csr/sme_blocking.c
View File

@ -321,7 +321,7 @@ int sme_mgt_scan_full(unifi_priv_t *priv,
unsigned char *channel_list)
{
CsrWifiMacAddress bcastAddress = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }};
CsrBool is_active = (num_channels > 0) ? TRUE : FALSE;
u8 is_active = (num_channels > 0) ? TRUE : FALSE;
int r;
if (priv->smepriv == NULL) {

14
drivers/staging/csr/sme_sys.c
View File

@ -1095,7 +1095,7 @@ void CsrWifiRouterCtrlWifiOnResHandler(void* drvpriv, CsrWifiFsmEvent* msg)
int i; /* used as a loop counter */
u32 intmode = CSR_WIFI_INTMODE_DEFAULT;
#ifdef CSR_WIFI_SPLIT_PATCH
CsrBool switching_ap_fw = FALSE;
u8 switching_ap_fw = FALSE;
#endif
/* Register the UniFi device with the OS network manager */
unifi_trace(priv, UDBG3, "Card Init Completed Successfully\n");
@ -1365,7 +1365,7 @@ _sys_packet_req(unifi_priv_t *priv, const CSR_SIGNAL *signal,
CsrWifiMacAddress peerMacAddress;
CsrResult csrResult;
u16 interfaceTag = req.VirtualInterfaceIdentifier & 0xff;
CsrBool eapolStore = FALSE;
u8 eapolStore = FALSE;
s8 protection = 0;
netInterface_priv_t *interfacePriv;
unsigned long flags;
@ -2101,7 +2101,7 @@ void CsrWifiRouterCtrlPeerDelReqHandler(void* drvpriv, CsrWifiFsmEvent* msg)
static int peer_add_new_record(unifi_priv_t *priv,CsrWifiRouterCtrlPeerAddReq *req,u32 *handle)
{
u8 i, powerModeTemp = 0;
CsrBool freeSlotFound = FALSE;
u8 freeSlotFound = FALSE;
CsrWifiRouterCtrlStaInfo_t *newRecord = NULL;
netInterface_priv_t *interfacePriv = priv->interfacePriv[req->interfaceTag];
CsrTime currentTime, currentTimeHi;
@ -2610,7 +2610,7 @@ static void ba_session_terminate_timer_func(unsigned long data)
}
CsrBool blockack_session_stop(unifi_priv_t *priv,
u8 blockack_session_stop(unifi_priv_t *priv,
u16 interfaceTag,
CsrWifiRouterCtrlBlockAckRole role,
u16 tID,
@ -2708,7 +2708,7 @@ CsrBool blockack_session_stop(unifi_priv_t *priv,
void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent* msg)
{
CsrWifiRouterCtrlBlockAckDisableReq* req = (CsrWifiRouterCtrlBlockAckDisableReq*)msg;
CsrBool r;
u8 r;
unifi_priv_t *priv = (unifi_priv_t*)drvpriv;
unifi_trace(priv, UDBG6, "%s: in ok\n", __FUNCTION__);
@ -2730,7 +2730,7 @@ void CsrWifiRouterCtrlBlockAckDisableReqHandler(void* drvpriv, CsrWifiFsmEvent*
}
CsrBool blockack_session_start(unifi_priv_t *priv,
u8 blockack_session_start(unifi_priv_t *priv,
u16 interfaceTag,
u16 tID,
u16 timeout,
@ -2946,7 +2946,7 @@ CsrBool blockack_session_start(unifi_priv_t *priv,
void CsrWifiRouterCtrlBlockAckEnableReqHandler(void* drvpriv, CsrWifiFsmEvent* msg)
{
CsrWifiRouterCtrlBlockAckEnableReq* req = (CsrWifiRouterCtrlBlockAckEnableReq*)msg;
CsrBool r;
u8 r;
unifi_priv_t *priv = (unifi_priv_t*)drvpriv;
unifi_trace(priv, UDBG6, ">>%s\n", __FUNCTION__);

18
drivers/staging/csr/unifi_event.c
View File

@ -91,25 +91,25 @@ static void send_to_client(unifi_priv_t *priv, ul_client_t *client,
* FALSE if the packet is for the driver or network stack
* ---------------------------------------------------------------------------
*/
static CsrBool check_routing_pkt_data_ind(unifi_priv_t *priv,
static u8 check_routing_pkt_data_ind(unifi_priv_t *priv,
u8 *sigdata,
const bulk_data_param_t* bulkdata,
CsrBool *freeBulkData,
u8 *freeBulkData,
netInterface_priv_t *interfacePriv)
{
u16 frmCtrl, receptionStatus, frmCtrlSubType;
u8 *macHdrLocation;
u8 interfaceTag;
CsrBool isDataFrame;
CsrBool isProtocolVerInvalid = FALSE;
CsrBool isDataFrameSubTypeNoData = FALSE;
u8 isDataFrame;
u8 isProtocolVerInvalid = FALSE;
u8 isDataFrameSubTypeNoData = FALSE;
#ifdef CSR_WIFI_SECURITY_WAPI_ENABLE
static const u8 wapiProtocolIdSNAPHeader[] = {0x88,0xb4};
static const u8 wapiProtocolIdSNAPHeaderOffset = 6;
u8 *destAddr;
u8 *srcAddr;
CsrBool isWapiUnicastPkt = FALSE;
u8 isWapiUnicastPkt = FALSE;
#ifdef CSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND
u16 qosControl;
@ -374,7 +374,7 @@ unifi_process_receive_event(void *ospriv,
int i, receiver_id;
int client_id;
s16 signal_id;
CsrBool pktIndToSme = FALSE, freeBulkData = FALSE;
u8 pktIndToSme = FALSE, freeBulkData = FALSE;
func_enter();
@ -490,7 +490,7 @@ unifi_process_receive_event(void *ospriv,
u8 *destAddr;
CsrResult res;
u16 interfaceTag = 0;
CsrBool isMcastPkt = TRUE;
u8 isMcastPkt = TRUE;
unifi_trace(priv, UDBG6, "Received a WAPI data packet when the Unicast/Multicast filter is set\n");
res = read_unpack_signal(sigdata, &signal);
@ -578,7 +578,7 @@ unifi_process_receive_event(void *ospriv,
#ifdef CSR_WIFI_RX_PATH_SPLIT
static CsrBool signal_buffer_is_full(unifi_priv_t* priv)
static u8 signal_buffer_is_full(unifi_priv_t* priv)
{
return (((priv->rxSignalBuffer.writePointer + 1)% priv->rxSignalBuffer.size) == (priv->rxSignalBuffer.readPointer));
}

50
drivers/staging/csr/unifi_pdu_processing.c
View File

@ -129,7 +129,7 @@ unifi_frame_ma_packet_req(unifi_priv_t *priv, CSR_PRIORITY priority,
static
int frame_and_send_queued_pdu(unifi_priv_t* priv,tx_buffered_packets_t* buffered_pkt,
CsrWifiRouterCtrlStaInfo_t *staRecord,CsrBool moreData , CsrBool eosp)
CsrWifiRouterCtrlStaInfo_t *staRecord,u8 moreData , u8 eosp)
{
CSR_SIGNAL signal;
@ -300,7 +300,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv)
struct list_head *listHead, *list;
struct list_head *placeHolder;
u8 i, j,eospFramedeleted=0;
CsrBool thresholdExcedeDueToBroadcast = TRUE;
u8 thresholdExcedeDueToBroadcast = TRUE;
/* it will be made it interface Specific in the future when multi interfaces are supported ,
right now interface 0 is considered */
netInterface_priv_t *interfacePriv = priv->interfacePriv[0];
@ -385,7 +385,7 @@ void verify_and_accomodate_tx_packet(unifi_priv_t *priv)
static
CsrResult enque_tx_data_pdu(unifi_priv_t *priv, bulk_data_param_t *bulkdata,
struct list_head *list, CSR_SIGNAL *signal,
CsrBool requeueOnSamePos)
u8 requeueOnSamePos)
{
/* queue the tx data packets on to appropriate queue */
@ -754,7 +754,7 @@ void uf_handle_tim_cfm(unifi_priv_t *priv, CSR_MLME_SET_TIM_CONFIRM *cfm, u16 re
* If failure crosses this Limit, we have to take a call to FIX
*/
if (retryCount > UNIFI_MAX_RETRY_LIMIT) {
CsrBool moreData = FALSE;
u8 moreData = FALSE;
retryCount = 0;
/* Because of continuos traffic in fh_cmd_q the tim set request is failing (exceeding retry limit)
* but if we didn't synchronize our timSet varible state with firmware then it can cause below issues
@ -959,7 +959,7 @@ void process_peer_active_transition(unifi_priv_t * priv,
u16 interfaceTag)
{
int r,i;
CsrBool spaceAvail[4] = {TRUE,TRUE,TRUE,TRUE};
u8 spaceAvail[4] = {TRUE,TRUE,TRUE,TRUE};
tx_buffered_packets_t * buffered_pkt = NULL;
unsigned long lock_flags;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
@ -1514,8 +1514,8 @@ uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb,
struct sk_buff *newSkb = NULL;
/* pointer to skb or private skb created using skb_copy() */
struct sk_buff *skbPtr = skb;
CsrBool sendToNetdev = FALSE;
CsrBool qosDestination = FALSE;
u8 sendToNetdev = FALSE;
u8 qosDestination = FALSE;
CSR_PRIORITY priority = CSR_CONTENTION;
CsrWifiRouterCtrlStaInfo_t *dstStaInfo = NULL;
netInterface_priv_t *interfacePriv;
@ -1660,13 +1660,13 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv,
const u8 *macHdrLocation = bulkdata->d[0].os_data_ptr;
CsrWifiPacketType pktType;
int frameType = 0;
CsrBool queuePacketDozing = FALSE;
u8 queuePacketDozing = FALSE;
u32 priority_q;
u16 frmCtrl;
struct list_head * list = NULL; /* List to which buffered PDUs are to be enqueued*/
CsrBool setBcTim=FALSE;
u8 setBcTim=FALSE;
netInterface_priv_t *interfacePriv;
CsrBool requeueOnSamePos = FALSE;
u8 requeueOnSamePos = FALSE;
u32 handle = 0xFFFFFFFF;
unsigned long lock_flags;
@ -2021,7 +2021,7 @@ u8 send_multicast_frames(unifi_priv_t *priv, u16 interfaceTag)
{
int r;
tx_buffered_packets_t * buffered_pkt = NULL;
CsrBool moreData = FALSE;
u8 moreData = FALSE;
u8 pduSent =0;
unsigned long lock_flags;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
@ -2203,7 +2203,7 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata,
#define GET_ACTIVE_INTERFACE_TAG(priv) 0
static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord)
static u8 uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord)
{
s8 i;
@ -2221,7 +2221,7 @@ static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouter
return FALSE;
}
static CsrBool uf_is_more_data_for_usp_delivery(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord, unifi_TrafficQueue queue)
static u8 uf_is_more_data_for_usp_delivery(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord, unifi_TrafficQueue queue)
{
s8 i;
@ -2268,9 +2268,9 @@ void uf_send_buffered_data_from_delivery_ac(unifi_priv_t *priv,
u16 interfaceTag = GET_ACTIVE_INTERFACE_TAG(priv);
tx_buffered_packets_t * buffered_pkt = NULL;
unsigned long lock_flags;
CsrBool eosp=FALSE;
u8 eosp=FALSE;
s8 r =0;
CsrBool moreData = FALSE;
u8 moreData = FALSE;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
unifi_trace(priv, UDBG2, "++uf_send_buffered_data_from_delivery_ac, active=%x\n", staInfo->uapsdActive);
@ -2368,8 +2368,8 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv,
{
tx_buffered_packets_t * buffered_pkt = NULL;
unsigned long lock_flags;
CsrBool eosp=FALSE;
CsrBool moreData = FALSE;
u8 eosp=FALSE;
u8 moreData = FALSE;
s8 r =0;
func_enter();
@ -2412,7 +2412,7 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q)
u32 startIndex=0,endIndex=0;
CsrWifiRouterCtrlStaInfo_t * staInfo = NULL;
u8 queue;
CsrBool moreData = FALSE;
u8 moreData = FALSE;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
@ -2549,7 +2549,7 @@ void uf_send_buffered_frames(unifi_priv_t *priv,unifi_TrafficQueue q)
}
CsrBool uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord)
u8 uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord)
{
u8 i;
@ -2916,7 +2916,7 @@ void uf_send_nulldata(unifi_priv_t * priv,u16 interfaceTag, const u8 *da,CSR_PRI
return;
}
CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata)
u8 uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata)
{
u8 *bssid = NULL;
static const CsrWifiMacAddress broadcast_address = {{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}};
@ -2957,11 +2957,11 @@ CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bu
}
CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,
u8 uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,
u8 pmBit,u16 interfaceTag)
{
CsrBool moreData = FALSE;
CsrBool powerSaveChanged = FALSE;
u8 moreData = FALSE;
u8 powerSaveChanged = FALSE;
unsigned long lock_flags;
unifi_trace(priv, UDBG3, "entering uf_process_pm_bit_for_peer\n");
@ -3060,7 +3060,7 @@ void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceT
CsrWifiMacAddress peerMacAddress;
unsigned long lock_flags;
s8 r =0;
CsrBool moreData = FALSE;
u8 moreData = FALSE;
netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
unifi_trace(priv, UDBG3, "entering uf_process_ps_poll\n");
@ -3594,7 +3594,7 @@ void resume_unicast_buffered_frames(unifi_priv_t *priv, u16 interfaceTag)
u8 i;
int j;
tx_buffered_packets_t * buffered_pkt = NULL;
CsrBool hipslotFree[4] = {TRUE,TRUE,TRUE,TRUE};
u8 hipslotFree[4] = {TRUE,TRUE,TRUE,TRUE};
int r;
unsigned long lock_flags;

58
drivers/staging/csr/unifi_priv.h
View File

@ -323,10 +323,10 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
/* Sme sends these parameters */
CsrWifiMacAddress peerMacAddress;
u32 assignedHandle;
CsrBool wmmOrQosEnabled;
u8 wmmOrQosEnabled;
CsrWifiAcPowersaveMode powersaveMode[MAX_ACCESS_CATOGORY];
u16 maxSpLength;
CsrBool uapsdActive;
u8 uapsdActive;
u16 noOfSpFramesSent;
/* Router/Driver database */
@ -337,7 +337,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
/* Inactivity feature parameters */
struct netInterface_priv *interfacePriv;
struct work_struct send_disconnected_ind_task;
CsrBool activity_flag;
u8 activity_flag;
u16 listenIntervalInTus;
CSR_CLIENT_TAG nullDataHostTag;
@ -345,7 +345,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
CsrTime lastActivity;
/* during m/c transmission sp suspended */
CsrBool uspSuspend;
u8 uspSuspend;
CSR_PRIORITY triggerFramePriority;
#endif
CsrWifiRouterCtrlPeerStatus currentPeerState;
@ -354,9 +354,9 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
u8 spStatus;
u8 prevFrmType;
u8 prevFrmAccessCatogory;
CsrBool protection;
u8 protection;
u16 aid;
CsrBool txSuspend;
u8 txSuspend;
u8 timSet;
/* Dont change the value of below macro for SET & RESET */
#define CSR_WIFI_TIM_RESET 0
@ -364,7 +364,7 @@ typedef struct CsrWifiRouterCtrlStaInfo_t {
#define CSR_WIFI_TIM_RESETTING 2
#define CSR_WIFI_TIM_SETTING 3
CsrBool timRequestPendingFlag;
u8 timRequestPendingFlag;
u8 updateTimReqQueued;
u16 noOfPktQueued;
}CsrWifiRouterCtrlStaInfo_t;
@ -501,7 +501,7 @@ struct unifi_priv {
#define CSR_WIFI_DRIVER_MAX_PKT_QUEUING_THRESHOLD_PER_PEER 64
#define CSR_WIFI_DRIVER_MINIMUM_BROADCAST_PKT_THRESHOLD 3
CsrBool routerBufferEnable[MAX_ACCESS_CATOGORY];
u8 routerBufferEnable[MAX_ACCESS_CATOGORY];
/* lock to protect stainfo members and priv members*/
spinlock_t staRecord_lock;
#endif
@ -616,7 +616,7 @@ struct unifi_priv {
int ptest_mode; /* Set when in production test mode */
int coredump_mode; /* Set when SME has requested a coredump */
CsrBool wol_suspend; /* Set when suspending with UniFi powered */
u8 wol_suspend; /* Set when suspending with UniFi powered */
#define UF_UNCONTROLLED_PORT_Q 0
#define UF_CONTROLLED_PORT_Q 1
@ -660,7 +660,7 @@ struct unifi_priv {
u8 wapi_unicast_filter;
u8 wapi_unicast_queued_pkt_filter;
#ifdef CSR_WIFI_SECURITY_WAPI_QOSCTRL_MIC_WORKAROUND
CsrBool isWapiConnection;
u8 isWapiConnection;
#endif
#endif
@ -668,7 +668,7 @@ struct unifi_priv {
CsrWifiRouterCtrlModeSetReq pending_mode_set;
#endif
CsrBool cmanrTestMode;
u8 cmanrTestMode;
CSR_RATE cmanrTestModeTransmitRate;
};
@ -680,7 +680,7 @@ typedef struct {
typedef struct {
CsrBool active;
u8 active;
bulk_data_param_t bulkdata;
CSR_SIGNAL signal;
u16 sn;
@ -695,7 +695,7 @@ typedef struct {
u16 timeout;
u16 expected_sn;
u16 start_sn;
CsrBool trigger_ba_after_ssn;
u8 trigger_ba_after_ssn;
struct netInterface_priv *interfacePriv;
u16 tID;
CsrWifiMacAddress macAddress;
@ -724,7 +724,7 @@ typedef struct netInterface_priv
#endif
struct net_device_stats stats;
u8 interfaceMode;
CsrBool protect;
u8 protect;
CsrWifiMacAddress bssid;
/*
* Flag to reflect state of CONNECTED indication signal.
@ -739,9 +739,9 @@ typedef struct netInterface_priv
} connected;
#ifdef CSR_SUPPORT_WEXT
/* Tracks when we are waiting for a netdevice state change callback */
CsrBool wait_netdev_change;
u8 wait_netdev_change;
/* True if we have successfully registered for netdev callbacks */
CsrBool netdev_callback_registered;
u8 netdev_callback_registered;
#endif /* CSR_SUPPORT_WEXT */
unsigned int netdev_registered;
#define UNIFI_MAX_MULTICAST_ADDRESSES 10
@ -764,7 +764,7 @@ typedef struct netInterface_priv
/* Timer for detecting station inactivity */
struct timer_list sta_activity_check_timer;
CsrBool sta_activity_check_enabled;
u8 sta_activity_check_enabled;
/* Timestamp when the last inactivity check was done */
CsrTime last_inactivity_check;
@ -787,15 +787,15 @@ typedef struct netInterface_priv
#endif
/* This should be removed and m4_hostTag should be used for checking*/
CsrBool m4_sent;
u8 m4_sent;
CSR_CLIENT_TAG m4_hostTag;
CsrBool dtimActive;
CsrBool intraBssEnabled;
u8 dtimActive;
u8 intraBssEnabled;
u32 multicastPduHostTag; /* Used to set the tim after getting
a confirm for it */
CsrBool bcTimSet;
CsrBool bcTimSetReqPendingFlag;
CsrBool bcTimSetReqQueued;
u8 bcTimSet;
u8 bcTimSetReqPendingFlag;
u8 bcTimSetReqQueued;
} netInterface_priv_t;
#ifndef ALLOW_Q_PAUSE
@ -895,7 +895,7 @@ unifi_priv_t *uf_alloc_netdevice(CsrSdioFunction *sdio_dev, int bus_id);
int uf_free_netdevice(unifi_priv_t *priv);
/* Allocating function for other interfaces */
CsrBool uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag);
u8 uf_alloc_netdevice_for_other_interfaces(unifi_priv_t *priv, u16 interfaceTag);
/*
* Firmware download related functions.
@ -956,15 +956,15 @@ int uf_verify_m4(unifi_priv_t *priv, const unsigned char *packet,
unsigned int length);
#ifdef CSR_SUPPORT_SME
CsrBool uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata);
CsrBool uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,u8 pmBit,u16 interfaceTag);
u8 uf_check_broadcast_bssid(unifi_priv_t *priv, const bulk_data_param_t *bulkdata);
u8 uf_process_pm_bit_for_peer(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,u8 pmBit,u16 interfaceTag);
void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,u16 interfaceTag);
int uf_ap_process_data_pdu(unifi_priv_t *priv, struct sk_buff *skb,
struct ethhdr *ehdr, CsrWifiRouterCtrlStaInfo_t * srcStaInfo,
const CSR_SIGNAL *signal,
bulk_data_param_t *bulkdata,
u8 macHeaderLengthInBytes);
CsrBool uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord);
u8 uf_is_more_data_for_non_delivery_ac(CsrWifiRouterCtrlStaInfo_t *staRecord);
void uf_process_wmm_deliver_ac_uapsd ( unifi_priv_t * priv,
CsrWifiRouterCtrlStaInfo_t * srcStaInfo,
u16 qosControl,
@ -1031,7 +1031,7 @@ int prepare_and_add_macheader(unifi_priv_t *priv,
u16 interfaceTag,
const u8 *daddr,
const u8 *saddr,
CsrBool protection);
u8 protection);
CSR_PRIORITY
get_packet_priority(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr *ehdr, netInterface_priv_t *interfacePriv);
@ -1064,7 +1064,7 @@ void scroll_ba_window(unifi_priv_t *priv,
ba_session_rx_struct *ba_session,
u16 sn);
CsrBool blockack_session_stop(unifi_priv_t *priv,
u8 blockack_session_stop(unifi_priv_t *priv,
u16 interfaceTag,
CsrWifiRouterCtrlBlockAckRole role,
u16 tID,

12
drivers/staging/csr/unifi_sme.c
View File

@ -115,7 +115,7 @@ sme_log_event(ul_client_t *pcli,
if (unpacked_signal.SignalPrimitiveHeader.SignalId == CSR_MA_PACKET_INDICATION_ID)
{
u16 frmCtrl;
CsrBool unicastPdu = TRUE;
u8 unicastPdu = TRUE;
u8 *macHdrLocation;
u8 *raddr = NULL, *taddr = NULL;
CsrWifiMacAddress peerMacAddress;
@ -727,7 +727,7 @@ int unifi_cfg_wmm_delts(unifi_priv_t *priv, unsigned char *arg)
int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg)
{
CsrBool strict_draft_n;
u8 strict_draft_n;
u8 *strict_draft_n_params;
int rc;
@ -735,7 +735,7 @@ int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg)
CsrWifiSmeDeviceConfig deviceConfig;
strict_draft_n_params = (u8*)(((unifi_cfg_command_t*)arg) + 1);
if (get_user(strict_draft_n, (CsrBool*)strict_draft_n_params)) {
if (get_user(strict_draft_n, (u8*)strict_draft_n_params)) {
unifi_error(priv, "unifi_cfg_strict_draft_n: Failed to get the argument\n");
return -EFAULT;
}
@ -763,7 +763,7 @@ int unifi_cfg_strict_draft_n(unifi_priv_t *priv, unsigned char *arg)
int unifi_cfg_enable_okc(unifi_priv_t *priv, unsigned char *arg)
{
CsrBool enable_okc;
u8 enable_okc;
u8 *enable_okc_params;
int rc;
@ -771,7 +771,7 @@ int unifi_cfg_enable_okc(unifi_priv_t *priv, unsigned char *arg)
CsrWifiSmeDeviceConfig deviceConfig;
enable_okc_params = (u8*)(((unifi_cfg_command_t*)arg) + 1);
if (get_user(enable_okc, (CsrBool*)enable_okc_params)) {
if (get_user(enable_okc, (u8*)enable_okc_params)) {
unifi_error(priv, "unifi_cfg_enable_okc: Failed to get the argument\n");
return -EFAULT;
}
@ -914,7 +914,7 @@ int
uf_configure_supported_rates(u8 * supportedRates, u8 phySupportedBitmap)
{
int i=0;
CsrBool b=FALSE, g = FALSE, n = FALSE;
u8 b=FALSE, g = FALSE, n = FALSE;
b = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_B;
n = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_N;
g = phySupportedBitmap & CSR_WIFI_SME_AP_PHY_SUPPORT_G;

2
drivers/staging/csr/unifi_sme.h
View File

@ -27,7 +27,7 @@ typedef int unifi_data_port_action;
typedef struct unifi_port_cfg
{
/* TRUE if this port entry is allocated */
CsrBool in_use;
u8 in_use;
CsrWifiRouterCtrlPortAction port_action;
CsrWifiMacAddress mac_address;
} unifi_port_cfg_t;

2
drivers/staging/csr/unifi_wext.h
View File

@ -60,7 +60,7 @@ void wext_send_disassoc_event(unifi_priv_t *priv);
void wext_send_michaelmicfailure_event(unifi_priv_t *priv,
u16 count, CsrWifiMacAddress address,
CsrWifiSmeKeyType keyType, u16 interfaceTag);
void wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, u16 interfaceTag);
void wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, u8 preauth_allowed, u16 interfaceTag);
void wext_send_started_event(unifi_priv_t *priv);

6
drivers/staging/csr/unifiio.h
View File

@ -314,15 +314,15 @@ typedef struct uf_cfg_ap_config
u8 channel;
u16 beaconInterval;
u8 dtimPeriod;
CsrBool wmmEnabled;
u8 wmmEnabled;
u8 shortSlotTimeEnabled;
u16 groupkeyTimeout;
CsrBool strictGtkRekeyEnabled;
u8 strictGtkRekeyEnabled;
u16 gmkTimeout;
u16 responseTimeout;
u8 retransLimit;
u8 rxStbc;
CsrBool rifsModeAllowed;
u8 rifsModeAllowed;
u8 dualCtsProtection;
u8 ctsProtectionType;
u16 maxListenInterval;

2
drivers/staging/csr/wext_events.c
View File

@ -238,7 +238,7 @@ wext_send_michaelmicfailure_event(unifi_priv_t *priv,
} /* wext_send_michaelmicfailure_event() */
void
wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, CsrBool preauth_allowed, u16 interfaceTag)
wext_send_pmkid_candidate_event(unifi_priv_t *priv, CsrWifiMacAddress bssid, u8 preauth_allowed, u16 interfaceTag)
{
#if WIRELESS_EXT > 17
union iwreq_data wrqu;