Staging: rt2860: rtmp.h: Fixed all bar one error.
All simple errors have been removed, including +80 line character limits and various pointer syntax isues. Signed-off-by: Neil Munro <neilmunro@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Neil Munro
committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
parent
a3327f0798
commit
fdb2fd14c7
@@ -181,8 +181,7 @@ struct rt_queue_header {
|
|||||||
(QueueHeader)->Head; \
|
(QueueHeader)->Head; \
|
||||||
{ \
|
{ \
|
||||||
struct rt_queue_entry *pNext; \
|
struct rt_queue_entry *pNext; \
|
||||||
if ((QueueHeader)->Head != NULL) \
|
if ((QueueHeader)->Head != NULL) { \
|
||||||
{ \
|
|
||||||
pNext = (QueueHeader)->Head->Next; \
|
pNext = (QueueHeader)->Head->Next; \
|
||||||
(QueueHeader)->Head->Next = NULL; \
|
(QueueHeader)->Head->Next = NULL; \
|
||||||
(QueueHeader)->Head = pNext; \
|
(QueueHeader)->Head = pNext; \
|
||||||
@@ -349,17 +348,14 @@ struct rt_rtmp_sg_list {
|
|||||||
/* if orginal Ethernet frame contains no LLC/SNAP, then an extra LLC/SNAP encap is required */
|
/* if orginal Ethernet frame contains no LLC/SNAP, then an extra LLC/SNAP encap is required */
|
||||||
#define EXTRA_LLCSNAP_ENCAP_FROM_PKT_START(_pBufVA, _pExtraLlcSnapEncap) \
|
#define EXTRA_LLCSNAP_ENCAP_FROM_PKT_START(_pBufVA, _pExtraLlcSnapEncap) \
|
||||||
{ \
|
{ \
|
||||||
if (((*(_pBufVA + 12) << 8) + *(_pBufVA + 13)) > 1500) \
|
if (((*(_pBufVA + 12) << 8) + *(_pBufVA + 13)) > 1500) { \
|
||||||
{ \
|
|
||||||
_pExtraLlcSnapEncap = SNAP_802_1H; \
|
_pExtraLlcSnapEncap = SNAP_802_1H; \
|
||||||
if (NdisEqualMemory(IPX, _pBufVA + 12, 2) || \
|
if (NdisEqualMemory(IPX, _pBufVA + 12, 2) || \
|
||||||
NdisEqualMemory(APPLE_TALK, _pBufVA + 12, 2)) \
|
NdisEqualMemory(APPLE_TALK, _pBufVA + 12, 2)) { \
|
||||||
{ \
|
|
||||||
_pExtraLlcSnapEncap = SNAP_BRIDGE_TUNNEL; \
|
_pExtraLlcSnapEncap = SNAP_BRIDGE_TUNNEL; \
|
||||||
} \
|
} \
|
||||||
} \
|
} \
|
||||||
else \
|
else { \
|
||||||
{ \
|
|
||||||
_pExtraLlcSnapEncap = NULL; \
|
_pExtraLlcSnapEncap = NULL; \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
@@ -367,17 +363,14 @@ struct rt_rtmp_sg_list {
|
|||||||
/* New Define for new Tx Path. */
|
/* New Define for new Tx Path. */
|
||||||
#define EXTRA_LLCSNAP_ENCAP_FROM_PKT_OFFSET(_pBufVA, _pExtraLlcSnapEncap) \
|
#define EXTRA_LLCSNAP_ENCAP_FROM_PKT_OFFSET(_pBufVA, _pExtraLlcSnapEncap) \
|
||||||
{ \
|
{ \
|
||||||
if (((*(_pBufVA) << 8) + *(_pBufVA + 1)) > 1500) \
|
if (((*(_pBufVA) << 8) + *(_pBufVA + 1)) > 1500) { \
|
||||||
{ \
|
|
||||||
_pExtraLlcSnapEncap = SNAP_802_1H; \
|
_pExtraLlcSnapEncap = SNAP_802_1H; \
|
||||||
if (NdisEqualMemory(IPX, _pBufVA, 2) || \
|
if (NdisEqualMemory(IPX, _pBufVA, 2) || \
|
||||||
NdisEqualMemory(APPLE_TALK, _pBufVA, 2)) \
|
NdisEqualMemory(APPLE_TALK, _pBufVA, 2)) { \
|
||||||
{ \
|
|
||||||
_pExtraLlcSnapEncap = SNAP_BRIDGE_TUNNEL; \
|
_pExtraLlcSnapEncap = SNAP_BRIDGE_TUNNEL; \
|
||||||
} \
|
} \
|
||||||
} \
|
} \
|
||||||
else \
|
else { \
|
||||||
{ \
|
|
||||||
_pExtraLlcSnapEncap = NULL; \
|
_pExtraLlcSnapEncap = NULL; \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
@@ -402,27 +395,23 @@ struct rt_rtmp_sg_list {
|
|||||||
\
|
\
|
||||||
_pRemovedLLCSNAP = NULL; \
|
_pRemovedLLCSNAP = NULL; \
|
||||||
if (NdisEqualMemory(SNAP_802_1H, _pData, 6) || \
|
if (NdisEqualMemory(SNAP_802_1H, _pData, 6) || \
|
||||||
NdisEqualMemory(SNAP_BRIDGE_TUNNEL, _pData, 6)) \
|
NdisEqualMemory(SNAP_BRIDGE_TUNNEL, _pData, 6)) { \
|
||||||
{ \
|
|
||||||
u8 *pProto = _pData + 6; \
|
u8 *pProto = _pData + 6; \
|
||||||
\
|
\
|
||||||
if ((NdisEqualMemory(IPX, pProto, 2) || NdisEqualMemory(APPLE_TALK, pProto, 2)) && \
|
if ((NdisEqualMemory(IPX, pProto, 2) || NdisEqualMemory(APPLE_TALK, pProto, 2)) && \
|
||||||
NdisEqualMemory(SNAP_802_1H, _pData, 6)) \
|
NdisEqualMemory(SNAP_802_1H, _pData, 6)) { \
|
||||||
{ \
|
|
||||||
LLC_Len[0] = (u8)(_DataSize / 256); \
|
LLC_Len[0] = (u8)(_DataSize / 256); \
|
||||||
LLC_Len[1] = (u8)(_DataSize % 256); \
|
LLC_Len[1] = (u8)(_DataSize % 256); \
|
||||||
MAKE_802_3_HEADER(_p8023hdr, _pDA, _pSA, LLC_Len); \
|
MAKE_802_3_HEADER(_p8023hdr, _pDA, _pSA, LLC_Len); \
|
||||||
} \
|
} \
|
||||||
else \
|
else { \
|
||||||
{ \
|
|
||||||
MAKE_802_3_HEADER(_p8023hdr, _pDA, _pSA, pProto); \
|
MAKE_802_3_HEADER(_p8023hdr, _pDA, _pSA, pProto); \
|
||||||
_pRemovedLLCSNAP = _pData; \
|
_pRemovedLLCSNAP = _pData; \
|
||||||
_DataSize -= LENGTH_802_1_H; \
|
_DataSize -= LENGTH_802_1_H; \
|
||||||
_pData += LENGTH_802_1_H; \
|
_pData += LENGTH_802_1_H; \
|
||||||
} \
|
} \
|
||||||
} \
|
} \
|
||||||
else \
|
else { \
|
||||||
{ \
|
|
||||||
LLC_Len[0] = (u8)(_DataSize / 256); \
|
LLC_Len[0] = (u8)(_DataSize / 256); \
|
||||||
LLC_Len[1] = (u8)(_DataSize % 256); \
|
LLC_Len[1] = (u8)(_DataSize % 256); \
|
||||||
MAKE_802_3_HEADER(_p8023hdr, _pDA, _pSA, LLC_Len); \
|
MAKE_802_3_HEADER(_p8023hdr, _pDA, _pSA, LLC_Len); \
|
||||||
@@ -3606,8 +3595,7 @@ void *RTMP_AllocateRxPacketBuffer(struct rt_rtmp_adapter *pAd,
|
|||||||
unsigned long Length,
|
unsigned long Length,
|
||||||
IN BOOLEAN Cached,
|
IN BOOLEAN Cached,
|
||||||
void **VirtualAddress,
|
void **VirtualAddress,
|
||||||
OUT dma_addr_t *
|
OUT dma_addr_t *PhysicalAddress);
|
||||||
PhysicalAddress);
|
|
||||||
|
|
||||||
void *RTMP_AllocateTxPacketBuffer(struct rt_rtmp_adapter *pAd,
|
void *RTMP_AllocateTxPacketBuffer(struct rt_rtmp_adapter *pAd,
|
||||||
unsigned long Length,
|
unsigned long Length,
|
||||||
@@ -3627,8 +3615,8 @@ void RTMP_QueryNextPacketInfo(void ** ppPacket,
|
|||||||
|
|
||||||
BOOLEAN RTMP_FillTxBlkInfo(struct rt_rtmp_adapter *pAd, struct rt_tx_blk *pTxBlk);
|
BOOLEAN RTMP_FillTxBlkInfo(struct rt_rtmp_adapter *pAd, struct rt_tx_blk *pTxBlk);
|
||||||
|
|
||||||
struct rt_rtmp_sg_list *
|
struct rt_rtmp_sg_list *rt_get_sg_list_from_packet(void *pPacket,
|
||||||
rt_get_sg_list_from_packet(void *pPacket, struct rt_rtmp_sg_list *sg);
|
struct rt_rtmp_sg_list *sg);
|
||||||
|
|
||||||
void announce_802_3_packet(struct rt_rtmp_adapter *pAd, void *pPacket);
|
void announce_802_3_packet(struct rt_rtmp_adapter *pAd, void *pPacket);
|
||||||
|
|
||||||
@@ -3717,23 +3705,19 @@ void wlan_802_11_to_802_3_packet(struct rt_rtmp_adapter *pAd,
|
|||||||
{ \
|
{ \
|
||||||
u8 *_pRemovedLLCSNAP = NULL, *_pDA, *_pSA; \
|
u8 *_pRemovedLLCSNAP = NULL, *_pDA, *_pSA; \
|
||||||
\
|
\
|
||||||
if (RX_BLK_TEST_FLAG(_pRxBlk, fRX_MESH)) \
|
if (RX_BLK_TEST_FLAG(_pRxBlk, fRX_MESH)) { \
|
||||||
{ \
|
|
||||||
_pDA = _pRxBlk->pHeader->Addr3; \
|
_pDA = _pRxBlk->pHeader->Addr3; \
|
||||||
_pSA = (u8 *)_pRxBlk->pHeader + sizeof(struct rt_header_802_11); \
|
_pSA = (u8 *)_pRxBlk->pHeader + sizeof(struct rt_header_802_11); \
|
||||||
} \
|
} \
|
||||||
else \
|
else {\
|
||||||
{ \
|
if (RX_BLK_TEST_FLAG(_pRxBlk, fRX_INFRA)) {\
|
||||||
if (RX_BLK_TEST_FLAG(_pRxBlk, fRX_INFRA)) \
|
|
||||||
{ \
|
|
||||||
_pDA = _pRxBlk->pHeader->Addr1; \
|
_pDA = _pRxBlk->pHeader->Addr1; \
|
||||||
if (RX_BLK_TEST_FLAG(_pRxBlk, fRX_DLS)) \
|
if (RX_BLK_TEST_FLAG(_pRxBlk, fRX_DLS)) \
|
||||||
_pSA = _pRxBlk->pHeader->Addr2; \
|
_pSA = _pRxBlk->pHeader->Addr2; \
|
||||||
else \
|
else \
|
||||||
_pSA = _pRxBlk->pHeader->Addr3; \
|
_pSA = _pRxBlk->pHeader->Addr3; \
|
||||||
} \
|
} \
|
||||||
else \
|
else { \
|
||||||
{ \
|
|
||||||
_pDA = _pRxBlk->pHeader->Addr1; \
|
_pDA = _pRxBlk->pHeader->Addr1; \
|
||||||
_pSA = _pRxBlk->pHeader->Addr2; \
|
_pSA = _pRxBlk->pHeader->Addr2; \
|
||||||
} \
|
} \
|
||||||
|
|||||||
Reference in New Issue
Block a user