aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/csr/csr_types.h1
-rw-r--r--drivers/staging/csr/csr_utf16.c4
-rw-r--r--drivers/staging/csr/csr_wifi_hip_card.h2
-rw-r--r--drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c8
-rw-r--r--drivers/staging/csr/csr_wifi_hip_download.c2
-rw-r--r--drivers/staging/csr/csr_wifi_hip_dump.c2
-rw-r--r--drivers/staging/csr/csr_wifi_hip_unifi.h4
-rw-r--r--drivers/staging/csr/csr_wifi_sme_prim.h12
-rw-r--r--drivers/staging/csr/csr_wifi_sme_serialize.c24
-rw-r--r--drivers/staging/csr/firmware.c2
-rw-r--r--drivers/staging/csr/netdev.c4
-rw-r--r--drivers/staging/csr/sme_sys.c4
-rw-r--r--drivers/staging/csr/unifi_pdu_processing.c18
-rw-r--r--drivers/staging/csr/unifi_priv.h2
14 files changed, 44 insertions, 45 deletions
diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h
index 683e07772bf..e2950602081 100644
--- a/drivers/staging/csr/csr_types.h
+++ b/drivers/staging/csr/csr_types.h
@@ -37,7 +37,6 @@ typedef uint16_t CsrUint16;
37typedef uint32_t CsrUint32; 37typedef uint32_t CsrUint32;
38 38
39/* Signed fixed width types */ 39/* Signed fixed width types */
40typedef int8_t CsrInt8;
41typedef int16_t CsrInt16; 40typedef int16_t CsrInt16;
42typedef int32_t CsrInt32; 41typedef int32_t CsrInt32;
43 42
diff --git a/drivers/staging/csr/csr_utf16.c b/drivers/staging/csr/csr_utf16.c
index 42fb7b0f968..6f709da0769 100644
--- a/drivers/staging/csr/csr_utf16.c
+++ b/drivers/staging/csr/csr_utf16.c
@@ -43,7 +43,7 @@
43* F1-F3 80-BF 80-BF 80-BF 43* F1-F3 80-BF 80-BF 80-BF
44* F4 80-8F 80-BF 80-BF 44* F4 80-8F 80-BF 80-BF
45*/ 45*/
46static const CsrInt8 trailingBytesForUtf8[256] = 46static const s8 trailingBytesForUtf8[256] =
47{ 47{
48 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 - 0x1F */ 48 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x00 - 0x1F */
49 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 - 0x3F */ 49 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0x20 - 0x3F */
@@ -568,7 +568,7 @@ CsrUtf16String *CsrUtf82Utf16String(const CsrUtf8String *utf8String)
568 CsrSize sourceLength; 568 CsrSize sourceLength;
569 CsrUtf16String *dest = NULL; 569 CsrUtf16String *dest = NULL;
570 CsrUtf16String *destStart = NULL; 570 CsrUtf16String *destStart = NULL;
571 CsrInt8 extraBytes2Read; 571 s8 extraBytes2Read;
572 572
573 if (!utf8String) 573 if (!utf8String)
574 { 574 {
diff --git a/drivers/staging/csr/csr_wifi_hip_card.h b/drivers/staging/csr/csr_wifi_hip_card.h
index c99a6065b5b..fcaf27dd353 100644
--- a/drivers/staging/csr/csr_wifi_hip_card.h
+++ b/drivers/staging/csr/csr_wifi_hip_card.h
@@ -104,7 +104,7 @@ CsrResult card_wait_for_firmware_to_start(card_t *card, CsrUint32 *paddr);
104CsrResult unifi_dl_firmware(card_t *card, void *arg); 104CsrResult unifi_dl_firmware(card_t *card, void *arg);
105CsrResult unifi_dl_patch(card_t *card, void *arg, CsrUint32 boot_ctrl); 105CsrResult unifi_dl_patch(card_t *card, void *arg, CsrUint32 boot_ctrl);
106CsrResult unifi_do_loader_op(card_t *card, CsrUint32 op_addr, u8 opcode); 106CsrResult unifi_do_loader_op(card_t *card, CsrUint32 op_addr, u8 opcode);
107void* unifi_dl_fw_read_start(card_t *card, CsrInt8 is_fw); 107void* unifi_dl_fw_read_start(card_t *card, s8 is_fw);
108 108
109CsrResult unifi_coredump_handle_request(card_t *card); 109CsrResult unifi_coredump_handle_request(card_t *card);
110 110
diff --git a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
index d5066ace787..d98610f3389 100644
--- a/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
+++ b/drivers/staging/csr/csr_wifi_hip_card_sdio_mem.c
@@ -564,7 +564,7 @@ CsrResult unifi_read_direct32(card_t *card, CsrUint32 addr, CsrUint32 *pdata)
564 * even address is read. 564 * even address is read.
565 * --------------------------------------------------------------------------- 565 * ---------------------------------------------------------------------------
566 */ 566 */
567static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len, CsrInt8 m, CsrUint32 *num) 567static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pdata, CsrUint16 len, s8 m, CsrUint32 *num)
568{ 568{
569 CsrResult r; 569 CsrResult r;
570 CsrUint32 i; 570 CsrUint32 i;
@@ -583,7 +583,7 @@ static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pd
583 } 583 }
584 584
585 *cptr++ = ((u8)w & 0xFF); 585 *cptr++ = ((u8)w & 0xFF);
586 if ((m >= 0) && (((CsrInt8)w & 0xFF) == m)) 586 if ((m >= 0) && (((s8)w & 0xFF) == m))
587 { 587 {
588 break; 588 break;
589 } 589 }
@@ -595,7 +595,7 @@ static CsrResult unifi_read_directn_match(card_t *card, CsrUint32 addr, void *pd
595 } 595 }
596 596
597 *cptr++ = ((u8)(w >> 8) & 0xFF); 597 *cptr++ = ((u8)(w >> 8) & 0xFF);
598 if ((m >= 0) && (((CsrInt8)(w >> 8) & 0xFF) == m)) 598 if ((m >= 0) && (((s8)(w >> 8) & 0xFF) == m))
599 { 599 {
600 break; 600 break;
601 } 601 }
@@ -1278,7 +1278,7 @@ CsrResult unifi_read32(card_t *card, CsrUint32 unifi_addr, CsrUint32 *pdata)
1278 * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified 1278 * CSR_WIFI_HIP_RESULT_INVALID_VALUE a bad generic pointer was specified
1279 * --------------------------------------------------------------------------- 1279 * ---------------------------------------------------------------------------
1280 */ 1280 */
1281CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len, CsrInt8 match) 1281CsrResult unifi_readn_match(card_t *card, CsrUint32 unifi_addr, void *pdata, CsrUint16 len, s8 match)
1282{ 1282{
1283 CsrUint32 sdio_addr; 1283 CsrUint32 sdio_addr;
1284 CsrResult r; 1284 CsrResult r;
diff --git a/drivers/staging/csr/csr_wifi_hip_download.c b/drivers/staging/csr/csr_wifi_hip_download.c
index c43f589cb88..4f7dae8b33c 100644
--- a/drivers/staging/csr/csr_wifi_hip_download.c
+++ b/drivers/staging/csr/csr_wifi_hip_download.c
@@ -465,7 +465,7 @@ CsrResult unifi_dl_patch(card_t *card, void *dlpriv, CsrUint32 boot_ctrl)
465} /* unifi_dl_patch() */ 465} /* unifi_dl_patch() */
466 466
467 467
468void* unifi_dl_fw_read_start(card_t *card, CsrInt8 is_fw) 468void* unifi_dl_fw_read_start(card_t *card, s8 is_fw)
469{ 469{
470 card_info_t card_info; 470 card_info_t card_info;
471 471
diff --git a/drivers/staging/csr/csr_wifi_hip_dump.c b/drivers/staging/csr/csr_wifi_hip_dump.c
index 5297f103e9e..efa699f20dc 100644
--- a/drivers/staging/csr/csr_wifi_hip_dump.c
+++ b/drivers/staging/csr/csr_wifi_hip_dump.c
@@ -99,7 +99,7 @@ static const struct coredump_zone zonedef_table[HIP_CDUMP_NUM_ZONES] = {
99 * immediately after that, the mini-coredump can be captured. 99 * immediately after that, the mini-coredump can be captured.
100 * --------------------------------------------------------------------------- 100 * ---------------------------------------------------------------------------
101 */ 101 */
102CsrResult unifi_coredump_request_at_next_reset(card_t *card, CsrInt8 enable) 102CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable)
103{ 103{
104 CsrResult r; 104 CsrResult r;
105 105
diff --git a/drivers/staging/csr/csr_wifi_hip_unifi.h b/drivers/staging/csr/csr_wifi_hip_unifi.h
index 62d77402b4e..1fb9d769424 100644
--- a/drivers/staging/csr/csr_wifi_hip_unifi.h
+++ b/drivers/staging/csr/csr_wifi_hip_unifi.h
@@ -701,7 +701,7 @@ void unifi_get_hip_qos_info(card_t *card, unifi_HipQosInfo *hipqosinfo);
701 * 701 *
702 * @ingroup upperedge 702 * @ingroup upperedge
703 */ 703 */
704void* unifi_fw_read_start(void *ospriv, CsrInt8 is_fw, const card_info_t *info); 704void* unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info);
705 705
706/** 706/**
707 * 707 *
@@ -871,7 +871,7 @@ void unifi_debug_hex_to_buf(const CsrCharString *buff, CsrUint16 length);
871/* Mini-coredump utility functions */ 871/* Mini-coredump utility functions */
872CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req); 872CsrResult unifi_coredump_get_value(card_t *card, struct unifi_coredump_req *req);
873CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req); 873CsrResult unifi_coredump_capture(card_t *card, struct unifi_coredump_req *req);
874CsrResult unifi_coredump_request_at_next_reset(card_t *card, CsrInt8 enable); 874CsrResult unifi_coredump_request_at_next_reset(card_t *card, s8 enable);
875CsrResult unifi_coredump_init(card_t *card, CsrUint16 num_dump_buffers); 875CsrResult unifi_coredump_init(card_t *card, CsrUint16 num_dump_buffers);
876void unifi_coredump_free(card_t *card); 876void unifi_coredump_free(card_t *card);
877 877
diff --git a/drivers/staging/csr/csr_wifi_sme_prim.h b/drivers/staging/csr/csr_wifi_sme_prim.h
index c9734a7339f..700f268ca76 100644
--- a/drivers/staging/csr/csr_wifi_sme_prim.h
+++ b/drivers/staging/csr/csr_wifi_sme_prim.h
@@ -3087,12 +3087,12 @@ typedef struct
3087 CsrWifiSmeScanConfigData scanCfg[4]; 3087 CsrWifiSmeScanConfigData scanCfg[4];
3088 CsrBool disableAutonomousScans; 3088 CsrBool disableAutonomousScans;
3089 CsrUint16 maxResults; 3089 CsrUint16 maxResults;
3090 CsrInt8 highRssiThreshold; 3090 s8 highRssiThreshold;
3091 CsrInt8 lowRssiThreshold; 3091 s8 lowRssiThreshold;
3092 CsrInt8 deltaRssiThreshold; 3092 s8 deltaRssiThreshold;
3093 CsrInt8 highSnrThreshold; 3093 s8 highSnrThreshold;
3094 CsrInt8 lowSnrThreshold; 3094 s8 lowSnrThreshold;
3095 CsrInt8 deltaSnrThreshold; 3095 s8 deltaSnrThreshold;
3096 CsrUint16 passiveChannelListCount; 3096 CsrUint16 passiveChannelListCount;
3097 u8 *passiveChannelList; 3097 u8 *passiveChannelList;
3098} CsrWifiSmeScanConfig; 3098} CsrWifiSmeScanConfig;
diff --git a/drivers/staging/csr/csr_wifi_sme_serialize.c b/drivers/staging/csr/csr_wifi_sme_serialize.c
index 4558629f8bd..f35f8368525 100644
--- a/drivers/staging/csr/csr_wifi_sme_serialize.c
+++ b/drivers/staging/csr/csr_wifi_sme_serialize.c
@@ -1133,12 +1133,12 @@ CsrSize CsrWifiSmeScanConfigSetReqSizeof(void *msg)
1133 } 1133 }
1134 bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */ 1134 bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */
1135 bufferSize += 2; /* CsrUint16 primitive->scanConfig.maxResults */ 1135 bufferSize += 2; /* CsrUint16 primitive->scanConfig.maxResults */
1136 bufferSize += 1; /* CsrInt8 primitive->scanConfig.highRssiThreshold */ 1136 bufferSize += 1; /* s8 primitive->scanConfig.highRssiThreshold */
1137 bufferSize += 1; /* CsrInt8 primitive->scanConfig.lowRssiThreshold */ 1137 bufferSize += 1; /* s8 primitive->scanConfig.lowRssiThreshold */
1138 bufferSize += 1; /* CsrInt8 primitive->scanConfig.deltaRssiThreshold */ 1138 bufferSize += 1; /* s8 primitive->scanConfig.deltaRssiThreshold */
1139 bufferSize += 1; /* CsrInt8 primitive->scanConfig.highSnrThreshold */ 1139 bufferSize += 1; /* s8 primitive->scanConfig.highSnrThreshold */
1140 bufferSize += 1; /* CsrInt8 primitive->scanConfig.lowSnrThreshold */ 1140 bufferSize += 1; /* s8 primitive->scanConfig.lowSnrThreshold */
1141 bufferSize += 1; /* CsrInt8 primitive->scanConfig.deltaSnrThreshold */ 1141 bufferSize += 1; /* s8 primitive->scanConfig.deltaSnrThreshold */
1142 bufferSize += 2; /* CsrUint16 primitive->scanConfig.passiveChannelListCount */ 1142 bufferSize += 2; /* CsrUint16 primitive->scanConfig.passiveChannelListCount */
1143 bufferSize += primitive->scanConfig.passiveChannelListCount; /* u8 primitive->scanConfig.passiveChannelList */ 1143 bufferSize += primitive->scanConfig.passiveChannelListCount; /* u8 primitive->scanConfig.passiveChannelList */
1144 return bufferSize; 1144 return bufferSize;
@@ -4412,12 +4412,12 @@ CsrSize CsrWifiSmeScanConfigGetCfmSizeof(void *msg)
4412 } 4412 }
4413 bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */ 4413 bufferSize += 1; /* CsrBool primitive->scanConfig.disableAutonomousScans */
4414 bufferSize += 2; /* CsrUint16 primitive->scanConfig.maxResults */ 4414 bufferSize += 2; /* CsrUint16 primitive->scanConfig.maxResults */
4415 bufferSize += 1; /* CsrInt8 primitive->scanConfig.highRssiThreshold */ 4415 bufferSize += 1; /* s8 primitive->scanConfig.highRssiThreshold */
4416 bufferSize += 1; /* CsrInt8 primitive->scanConfig.lowRssiThreshold */ 4416 bufferSize += 1; /* s8 primitive->scanConfig.lowRssiThreshold */
4417 bufferSize += 1; /* CsrInt8 primitive->scanConfig.deltaRssiThreshold */ 4417 bufferSize += 1; /* s8 primitive->scanConfig.deltaRssiThreshold */
4418 bufferSize += 1; /* CsrInt8 primitive->scanConfig.highSnrThreshold */ 4418 bufferSize += 1; /* s8 primitive->scanConfig.highSnrThreshold */
4419 bufferSize += 1; /* CsrInt8 primitive->scanConfig.lowSnrThreshold */ 4419 bufferSize += 1; /* s8 primitive->scanConfig.lowSnrThreshold */
4420 bufferSize += 1; /* CsrInt8 primitive->scanConfig.deltaSnrThreshold */ 4420 bufferSize += 1; /* s8 primitive->scanConfig.deltaSnrThreshold */
4421 bufferSize += 2; /* CsrUint16 primitive->scanConfig.passiveChannelListCount */ 4421 bufferSize += 2; /* CsrUint16 primitive->scanConfig.passiveChannelListCount */
4422 bufferSize += primitive->scanConfig.passiveChannelListCount; /* u8 primitive->scanConfig.passiveChannelList */ 4422 bufferSize += primitive->scanConfig.passiveChannelListCount; /* u8 primitive->scanConfig.passiveChannelList */
4423 return bufferSize; 4423 return bufferSize;
diff --git a/drivers/staging/csr/firmware.c b/drivers/staging/csr/firmware.c
index 98e27d6f440..8199ff98bbd 100644
--- a/drivers/staging/csr/firmware.c
+++ b/drivers/staging/csr/firmware.c
@@ -57,7 +57,7 @@
57 * --------------------------------------------------------------------------- 57 * ---------------------------------------------------------------------------
58 */ 58 */
59void* 59void*
60unifi_fw_read_start(void *ospriv, CsrInt8 is_fw, const card_info_t *info) 60unifi_fw_read_start(void *ospriv, s8 is_fw, const card_info_t *info)
61{ 61{
62 unifi_priv_t *priv = (unifi_priv_t*)ospriv; 62 unifi_priv_t *priv = (unifi_priv_t*)ospriv;
63 CSR_UNUSED(info); 63 CSR_UNUSED(info);
diff --git a/drivers/staging/csr/netdev.c b/drivers/staging/csr/netdev.c
index e18395c1654..cef0ba367bd 100644
--- a/drivers/staging/csr/netdev.c
+++ b/drivers/staging/csr/netdev.c
@@ -1080,7 +1080,7 @@ skb_add_llc_snap(struct net_device *dev, struct sk_buff *skb, int proto)
1080#ifdef CSR_SUPPORT_SME 1080#ifdef CSR_SUPPORT_SME
1081static int 1081static int
1082_identify_sme_ma_pkt_ind(unifi_priv_t *priv, 1082_identify_sme_ma_pkt_ind(unifi_priv_t *priv,
1083 const CsrInt8 *oui, CsrUint16 protocol, 1083 const s8 *oui, CsrUint16 protocol,
1084 const CSR_SIGNAL *signal, 1084 const CSR_SIGNAL *signal,
1085 bulk_data_param_t *bulkdata, 1085 bulk_data_param_t *bulkdata,
1086 const unsigned char *daddr, 1086 const unsigned char *daddr,
@@ -1657,7 +1657,7 @@ send_ma_pkt_request(unifi_priv_t *priv, struct sk_buff *skb, const struct ethhdr
1657 CsrUint16 interfaceTag; 1657 CsrUint16 interfaceTag;
1658 CsrWifiMacAddress peerAddress; 1658 CsrWifiMacAddress peerAddress;
1659 CSR_TRANSMISSION_CONTROL transmissionControl = CSR_NO_CONFIRM_REQUIRED; 1659 CSR_TRANSMISSION_CONTROL transmissionControl = CSR_NO_CONFIRM_REQUIRED;
1660 CsrInt8 protection; 1660 s8 protection;
1661 netInterface_priv_t *interfacePriv = NULL; 1661 netInterface_priv_t *interfacePriv = NULL;
1662 CSR_RATE TransmitRate = (CSR_RATE)0; 1662 CSR_RATE TransmitRate = (CSR_RATE)0;
1663 1663
diff --git a/drivers/staging/csr/sme_sys.c b/drivers/staging/csr/sme_sys.c
index a84d99f7892..e28e7c8ce0c 100644
--- a/drivers/staging/csr/sme_sys.c
+++ b/drivers/staging/csr/sme_sys.c
@@ -404,7 +404,7 @@ uf_send_gratuitous_arp(unifi_priv_t *priv, CsrUint16 interfaceTag)
404 bulk_data_param_t bulkdata; 404 bulk_data_param_t bulkdata;
405 CsrResult csrResult; 405 CsrResult csrResult;
406 struct sk_buff *skb, *newSkb = NULL; 406 struct sk_buff *skb, *newSkb = NULL;
407 CsrInt8 protection; 407 s8 protection;
408 int r; 408 int r;
409 static const u8 arp_req[36] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00, 409 static const u8 arp_req[36] = {0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00,
410 0x08, 0x06, 0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x01, 410 0x08, 0x06, 0x00, 0x01, 0x08, 0x00, 0x06, 0x04, 0x00, 0x01,
@@ -1366,7 +1366,7 @@ _sys_packet_req(unifi_priv_t *priv, const CSR_SIGNAL *signal,
1366 CsrResult csrResult; 1366 CsrResult csrResult;
1367 CsrUint16 interfaceTag = req.VirtualInterfaceIdentifier & 0xff; 1367 CsrUint16 interfaceTag = req.VirtualInterfaceIdentifier & 0xff;
1368 CsrBool eapolStore = FALSE; 1368 CsrBool eapolStore = FALSE;
1369 CsrInt8 protection = 0; 1369 s8 protection = 0;
1370 netInterface_priv_t *interfacePriv; 1370 netInterface_priv_t *interfacePriv;
1371 unsigned long flags; 1371 unsigned long flags;
1372 1372
diff --git a/drivers/staging/csr/unifi_pdu_processing.c b/drivers/staging/csr/unifi_pdu_processing.c
index 3c0491b0d31..a007a59aef9 100644
--- a/drivers/staging/csr/unifi_pdu_processing.c
+++ b/drivers/staging/csr/unifi_pdu_processing.c
@@ -1976,9 +1976,9 @@ CsrResult uf_process_ma_packet_req(unifi_priv_t *priv,
1976} 1976}
1977 1977
1978#ifdef CSR_SUPPORT_SME 1978#ifdef CSR_SUPPORT_SME
1979CsrInt8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr) 1979s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr)
1980{ 1980{
1981 CsrInt8 protection = 0; 1981 s8 protection = 0;
1982 netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; 1982 netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
1983 1983
1984 switch(interfacePriv->interfaceMode) 1984 switch(interfacePriv->interfaceMode)
@@ -2205,7 +2205,7 @@ void uf_process_ma_vif_availibility_ind(unifi_priv_t *priv,u8 *sigdata,
2205 2205
2206static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord) 2206static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord)
2207{ 2207{
2208 CsrInt8 i; 2208 s8 i;
2209 2209
2210 for(i=UNIFI_TRAFFIC_Q_VO; i >= UNIFI_TRAFFIC_Q_BK; i--) 2210 for(i=UNIFI_TRAFFIC_Q_VO; i >= UNIFI_TRAFFIC_Q_BK; i--)
2211 { 2211 {
@@ -2223,7 +2223,7 @@ static CsrBool uf_is_more_data_for_delivery_ac(unifi_priv_t *priv, CsrWifiRouter
2223 2223
2224static CsrBool uf_is_more_data_for_usp_delivery(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord, unifi_TrafficQueue queue) 2224static CsrBool uf_is_more_data_for_usp_delivery(unifi_priv_t *priv, CsrWifiRouterCtrlStaInfo_t *staRecord, unifi_TrafficQueue queue)
2225{ 2225{
2226 CsrInt8 i; 2226 s8 i;
2227 2227
2228 for(i = queue; i >= UNIFI_TRAFFIC_Q_BK; i--) 2228 for(i = queue; i >= UNIFI_TRAFFIC_Q_BK; i--)
2229 { 2229 {
@@ -2269,7 +2269,7 @@ void uf_send_buffered_data_from_delivery_ac(unifi_priv_t *priv,
2269 tx_buffered_packets_t * buffered_pkt = NULL; 2269 tx_buffered_packets_t * buffered_pkt = NULL;
2270 unsigned long lock_flags; 2270 unsigned long lock_flags;
2271 CsrBool eosp=FALSE; 2271 CsrBool eosp=FALSE;
2272 CsrInt8 r =0; 2272 s8 r =0;
2273 CsrBool moreData = FALSE; 2273 CsrBool moreData = FALSE;
2274 netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; 2274 netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
2275 2275
@@ -2370,7 +2370,7 @@ void uf_send_buffered_data_from_ac(unifi_priv_t *priv,
2370 unsigned long lock_flags; 2370 unsigned long lock_flags;
2371 CsrBool eosp=FALSE; 2371 CsrBool eosp=FALSE;
2372 CsrBool moreData = FALSE; 2372 CsrBool moreData = FALSE;
2373 CsrInt8 r =0; 2373 s8 r =0;
2374 2374
2375 func_enter(); 2375 func_enter();
2376 2376
@@ -2639,7 +2639,7 @@ int uf_process_station_records_for_sending_data(unifi_priv_t *priv,CsrUint16 int
2639static void uf_handle_uspframes_delivery(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t *staInfo, CsrUint16 interfaceTag) 2639static void uf_handle_uspframes_delivery(unifi_priv_t * priv, CsrWifiRouterCtrlStaInfo_t *staInfo, CsrUint16 interfaceTag)
2640{ 2640{
2641 2641
2642 CsrInt8 i; 2642 s8 i;
2643 u8 allDeliveryEnabled = 0, dataAvailable = 0; 2643 u8 allDeliveryEnabled = 0, dataAvailable = 0;
2644 netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; 2644 netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
2645 unsigned long lock_flags; 2645 unsigned long lock_flags;
@@ -3059,7 +3059,7 @@ void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,CsrUint16 inte
3059 tx_buffered_packets_t * buffered_pkt = NULL; 3059 tx_buffered_packets_t * buffered_pkt = NULL;
3060 CsrWifiMacAddress peerMacAddress; 3060 CsrWifiMacAddress peerMacAddress;
3061 unsigned long lock_flags; 3061 unsigned long lock_flags;
3062 CsrInt8 r =0; 3062 s8 r =0;
3063 CsrBool moreData = FALSE; 3063 CsrBool moreData = FALSE;
3064 netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag]; 3064 netInterface_priv_t *interfacePriv = priv->interfacePriv[interfaceTag];
3065 3065
@@ -3233,7 +3233,7 @@ void uf_process_ps_poll(unifi_priv_t *priv,u8* sa,u8* da,u8 pmBit,CsrUint16 inte
3233 } 3233 }
3234 3234
3235 } else { 3235 } else {
3236 CsrInt8 i; 3236 s8 i;
3237 /* We dont have buffered packet in mangement frame queue (1 failed), So proceed with condition 2 3237 /* We dont have buffered packet in mangement frame queue (1 failed), So proceed with condition 2
3238 * UNIFI_TRAFFIC_Q_VO -> VI -> BE -> BK 3238 * UNIFI_TRAFFIC_Q_VO -> VI -> BE -> BK
3239 */ 3239 */
diff --git a/drivers/staging/csr/unifi_priv.h b/drivers/staging/csr/unifi_priv.h
index 666e17f02f6..f56c7025380 100644
--- a/drivers/staging/csr/unifi_priv.h
+++ b/drivers/staging/csr/unifi_priv.h
@@ -1071,7 +1071,7 @@ CsrBool blockack_session_stop(unifi_priv_t *priv,
1071 CsrWifiMacAddress macAddress); 1071 CsrWifiMacAddress macAddress);
1072#ifdef CSR_SUPPORT_SME 1072#ifdef CSR_SUPPORT_SME
1073/* Fetch the protection information from interface Mode */ 1073/* Fetch the protection information from interface Mode */
1074CsrInt8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr); 1074s8 uf_get_protection_bit_from_interfacemode(unifi_priv_t *priv, CsrUint16 interfaceTag, const u8 *daddr);
1075#endif 1075#endif
1076 1076
1077/* Fetch the station record handler from data base for matching Mac address */ 1077/* Fetch the station record handler from data base for matching Mac address */
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-22 15:23:08 -0400