Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b38e274fdb6dfa2dd77598b8b6e2c32d7608f494

Authored by Peter Meerwald
Committed by Greg Kroah-Hartman
1 parent f922ffc0b5
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

staging bcm: spelling of suppress in code 

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 2 changed files with 14 additions and 14 deletions Side-by-side Diff

drivers/staging/bcm/Adapter.h
Diff comments   View file @ b38e274
... ... @@ -54,9 +54,9 @@
54 54 };
55 55 } U_IP_ADDRESS;
56 56  
57   -struct bcm_hdr_supression_contextinfo {
58   - UCHAR ucaHdrSupressionInBuf[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 */
  57 +struct bcm_hdr_suppression_contextinfo {
  58 + UCHAR ucaHdrSuppressionInBuf[MAX_PHS_LENGTHS]; /* Intermediate buffer to accumulate pkt Header for PHS */
  59 + UCHAR ucaHdrSuppressionOutBuf[MAX_PHS_LENGTHS + PHSI_LEN]; /* Intermediate buffer containing pkt Header after PHS */
60 60 };
61 61  
62 62 struct bcm_classifier_rule {
... ... @@ -334,7 +334,7 @@
334 334 BOOLEAN bLinkDownRequested;
335 335 int downloadDDR;
336 336 PHS_DEVICE_EXTENSION stBCMPhsContext;
337   - struct bcm_hdr_supression_contextinfo stPhsTxContextInfo;
  337 + struct bcm_hdr_suppression_contextinfo stPhsTxContextInfo;
338 338 uint8_t ucaPHSPktRestoreBuf[2048];
339 339 uint8_t bPHSEnabled;
340 340 BOOLEAN AutoFirmDld;
drivers/staging/bcm/PHSModule.c
Diff comments   View file @ b38e274
... ... @@ -84,10 +84,10 @@
84 84 UINT unPHSNewPktHeaderLen = 0;
85 85 /* Pointer to PHS IN Hdr Buffer */
86 86 PUCHAR pucPHSPktHdrInBuf =
87   - Adapter->stPhsTxContextInfo.ucaHdrSupressionInBuf;
  87 + Adapter->stPhsTxContextInfo.ucaHdrSuppressionInBuf;
88 88 /* Pointer to PHS OUT Hdr Buffer */
89 89 PUCHAR pucPHSPktHdrOutBuf =
90   - Adapter->stPhsTxContextInfo.ucaHdrSupressionOutBuf;
  90 + Adapter->stPhsTxContextInfo.ucaHdrSuppressionOutBuf;
91 91 UINT usPacketType;
92 92 UINT BytesToRemove=0;
93 93 BOOLEAN bPHSI = 0;
... ... @@ -217,7 +217,7 @@
217 217 UINT bHeaderSuppressionEnabled)
218 218 {
219 219 u32 nStandardPktHdrLen = 0;
220   - u32 nTotalsupressedPktHdrBytes = 0;
  220 + u32 nTotalsuppressedPktHdrBytes = 0;
221 221 int ulPhsStatus = 0;
222 222 PUCHAR pucInBuff = NULL ;
223 223 UINT TotalBytesAdded = 0;
224 224  
... ... @@ -235,11 +235,11 @@
235 235 usVcid,
236 236 pucInBuff,
237 237 Adapter->ucaPHSPktRestoreBuf,
238   - &nTotalsupressedPktHdrBytes,
  238 + &nTotalsuppressedPktHdrBytes,
239 239 &nStandardPktHdrLen);
240 240  
241 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 244 if(ulPhsStatus != STATUS_PHS_COMPRESSED)
245 245 {
... ... @@ -248,7 +248,7 @@
248 248 }
249 249 else
250 250 {
251   - TotalBytesAdded = nStandardPktHdrLen - nTotalsupressedPktHdrBytes - PHSI_LEN;
  251 + TotalBytesAdded = nStandardPktHdrLen - nTotalsuppressedPktHdrBytes - PHSI_LEN;
252 252 if(TotalBytesAdded)
253 253 {
254 254 if(skb_headroom(packet) >= (SKB_RESERVE_ETHERNET_HEADER + TotalBytesAdded))
... ... @@ -1494,7 +1494,7 @@
1494 1494 ,unsigned char *out_buf,UINT *header_size,UINT *new_header_size)
1495 1495 {
1496 1496 unsigned char *old_addr = out_buf;
1497   - int supress = 0;
  1497 + int suppress = 0;
1498 1498 struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
1499 1499 if(phs_rule == NULL)
1500 1500 {
1501 1501  
... ... @@ -1514,10 +1514,10 @@
1514 1514 }
1515 1515 //To copy PHSI
1516 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 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 1522 *old_addr = (unsigned char)phs_rule->u8PHSI;
1523 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 @@
1527 1527 *old_addr = ZERO_PHSI;
1528 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