aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2012-06-13 14:44:35 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-13 15:18:02 -0400
commitb38e274fdb6dfa2dd77598b8b6e2c32d7608f494 (patch)
tree6029ee7d92c0efeeb34af0832031c3c3fac148c1
parentf922ffc0b52f8ee9e7503e769fa6931cb51635ab (diff)
staging bcm: spelling of suppress in code
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/bcm/Adapter.h8
-rw-r--r--drivers/staging/bcm/PHSModule.c20
2 files changed, 14 insertions, 14 deletions
diff --git a/drivers/staging/bcm/Adapter.h b/drivers/staging/bcm/Adapter.h
index 11d2c5a84552..4d490a99110c 100644
--- a/drivers/staging/bcm/Adapter.h
+++ b/drivers/staging/bcm/Adapter.h
@@ -54,9 +54,9 @@ typedef union _U_IP_ADDRESS {
54 }; 54 };
55} U_IP_ADDRESS; 55} U_IP_ADDRESS;
56 56
57struct bcm_hdr_supression_contextinfo { 57struct bcm_hdr_suppression_contextinfo {
58 UCHAR ucaHdrSupressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to accumulate pkt Header for PHS */ 58 UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to accumulate pkt Header for PHS */
59 UCHAR ucaHdrSupressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* Intermediate buffer containing pkt Header after PHS */ 59 UCHAR ucaHdrSuppressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* Intermediate buffer containing pkt Header after PHS */
60}; 60};
61 61
62struct bcm_classifier_rule { 62struct bcm_classifier_rule {
@@ -334,7 +334,7 @@ struct bcm_mini_adapter {
334 BOOLEAN bLinkDownRequested; 334 BOOLEAN bLinkDownRequested;
335 int downloadDDR; 335 int downloadDDR;
336 PHS_DEVICE_EXTENSION stBCMPhsContext; 336 PHS_DEVICE_EXTENSION stBCMPhsContext;
337 struct bcm_hdr_supression_contextinfo stPhsTxContextInfo; 337 struct bcm_hdr_suppression_contextinfo stPhsTxContextInfo;
338 uint8_t ucaPHSPktRestoreBuf[2048]; 338 uint8_t ucaPHSPktRestoreBuf[2048];
339 uint8_t bPHSEnabled; 339 uint8_t bPHSEnabled;
340 BOOLEAN AutoFirmDld; 340 BOOLEAN AutoFirmDld;
diff --git a/drivers/staging/bcm/PHSModule.c b/drivers/staging/bcm/PHSModule.c
index c0862c6c21a0..479574234e4c 100644
--- a/drivers/staging/bcm/PHSModule.c
+++ b/drivers/staging/bcm/PHSModule.c
@@ -84,10 +84,10 @@ int PHSTransmit(struct bcm_mini_adapter *Adapter,
84 UINT unPHSNewPktHeaderLen = 0; 84 UINT unPHSNewPktHeaderLen = 0;
85 /* Pointer to PHS IN Hdr Buffer */ 85 /* Pointer to PHS IN Hdr Buffer */
86 PUCHAR pucPHSPktHdrInBuf = 86 PUCHAR pucPHSPktHdrInBuf =
87 Adapter->stPhsTxContextInfo.ucaHdrSupressionInBuf; 87 Adapter->stPhsTxContextInfo.ucaHdrSuppressionInBuf;
88 /* Pointer to PHS OUT Hdr Buffer */ 88 /* Pointer to PHS OUT Hdr Buffer */
89 PUCHAR pucPHSPktHdrOutBuf = 89 PUCHAR pucPHSPktHdrOutBuf =
90 Adapter->stPhsTxContextInfo.ucaHdrSupressionOutBuf; 90 Adapter->stPhsTxContextInfo.ucaHdrSuppressionOutBuf;
91 UINT usPacketType; 91 UINT usPacketType;
92 UINT BytesToRemove=0; 92 UINT BytesToRemove=0;
93 BOOLEAN bPHSI = 0; 93 BOOLEAN bPHSI = 0;
@@ -217,7 +217,7 @@ int PHSReceive(struct bcm_mini_adapter *Adapter,
217 UINT bHeaderSuppressionEnabled) 217 UINT bHeaderSuppressionEnabled)
218{ 218{
219 u32 nStandardPktHdrLen = 0; 219 u32 nStandardPktHdrLen = 0;
220 u32 nTotalsupressedPktHdrBytes = 0; 220 u32 nTotalsuppressedPktHdrBytes = 0;
221 int ulPhsStatus = 0; 221 int ulPhsStatus = 0;
222 PUCHAR pucInBuff = NULL ; 222 PUCHAR pucInBuff = NULL ;
223 UINT TotalBytesAdded = 0; 223 UINT TotalBytesAdded = 0;
@@ -235,11 +235,11 @@ int PHSReceive(struct bcm_mini_adapter *Adapter,
235 usVcid, 235 usVcid,
236 pucInBuff, 236 pucInBuff,
237 Adapter->ucaPHSPktRestoreBuf, 237 Adapter->ucaPHSPktRestoreBuf,
238 &nTotalsupressedPktHdrBytes, 238 &nTotalsuppressedPktHdrBytes,
239 &nStandardPktHdrLen); 239 &nStandardPktHdrLen);
240 240
241 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nSuppressed PktHdrLen : 0x%x Restored PktHdrLen : 0x%x", 241 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_RECEIVE,DBG_LVL_ALL,"\nSuppressed PktHdrLen : 0x%x Restored PktHdrLen : 0x%x",
242 nTotalsupressedPktHdrBytes,nStandardPktHdrLen); 242 nTotalsuppressedPktHdrBytes,nStandardPktHdrLen);
243 243
244 if(ulPhsStatus != STATUS_PHS_COMPRESSED) 244 if(ulPhsStatus != STATUS_PHS_COMPRESSED)
245 { 245 {
@@ -248,7 +248,7 @@ int PHSReceive(struct bcm_mini_adapter *Adapter,
248 } 248 }
249 else 249 else
250 { 250 {
251 TotalBytesAdded = nStandardPktHdrLen - nTotalsupressedPktHdrBytes - PHSI_LEN; 251 TotalBytesAdded = nStandardPktHdrLen - nTotalsuppressedPktHdrBytes - PHSI_LEN;
252 if(TotalBytesAdded) 252 if(TotalBytesAdded)
253 { 253 {
254 if(skb_headroom(packet) >= (SKB_RESERVE_ETHERNET_HEADER + TotalBytesAdded)) 254 if(skb_headroom(packet) >= (SKB_RESERVE_ETHERNET_HEADER + TotalBytesAdded))
@@ -1494,7 +1494,7 @@ static int phs_compress(S_PHS_RULE *phs_rule,unsigned char *in_buf
1494 ,unsigned char *out_buf,UINT *header_size,UINT *new_header_size) 1494 ,unsigned char *out_buf,UINT *header_size,UINT *new_header_size)
1495{ 1495{
1496 unsigned char *old_addr = out_buf; 1496 unsigned char *old_addr = out_buf;
1497 int supress = 0; 1497 int suppress = 0;
1498 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev); 1498 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
1499 if(phs_rule == NULL) 1499 if(phs_rule == NULL)
1500 { 1500 {
@@ -1514,10 +1514,10 @@ static int phs_compress(S_PHS_RULE *phs_rule,unsigned char *in_buf
1514 } 1514 }
1515 //To copy PHSI 1515 //To copy PHSI
1516 out_buf++; 1516 out_buf++;
1517 supress = verify_suppress_phsf(in_buf,out_buf,phs_rule->u8PHSF, 1517 suppress = verify_suppress_phsf(in_buf,out_buf,phs_rule->u8PHSF,
1518 phs_rule->u8PHSM, phs_rule->u8PHSS, phs_rule->u8PHSV,new_header_size); 1518 phs_rule->u8PHSM, phs_rule->u8PHSS, phs_rule->u8PHSV,new_header_size);
1519 1519
1520 if(supress == STATUS_PHS_COMPRESSED) 1520 if(suppress == STATUS_PHS_COMPRESSED)
1521 { 1521 {
1522 *old_addr = (unsigned char)phs_rule->u8PHSI; 1522 *old_addr = (unsigned char)phs_rule->u8PHSI;
1523 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In phs_compress phsi %d",phs_rule->u8PHSI); 1523 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In phs_compress phsi %d",phs_rule->u8PHSI);
@@ -1527,7 +1527,7 @@ static int phs_compress(S_PHS_RULE *phs_rule,unsigned char *in_buf
1527 *old_addr = ZERO_PHSI; 1527 *old_addr = ZERO_PHSI;
1528 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In phs_compress PHSV Verification failed"); 1528 BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_SEND, DBG_LVL_ALL,"\nCOMP:In phs_compress PHSV Verification failed");
1529 } 1529 }
1530 return supress; 1530 return suppress;
1531} 1531}
1532 1532
1533 1533