Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 353799
b: refs/heads/master
c: 60dadf9
h: refs/heads/master
i:
  353797: 7e8426e
  353795: fa86538
  353791: f60c668
v: v3
  • Loading branch information
Kevin McKinney authored and Greg Kroah-Hartman committed Jan 7, 2013
1 parent 8319a9e commit 321b35d
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 86773aa91240d9361b38a41706b9c1b09be75da3
refs/heads/master: 60dadf9def544665a696ee9b25ff12de32b51a3a
2 changes: 1 addition & 1 deletion trunk/drivers/staging/bcm/Adapter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ struct bcm_mini_adapter {
/* BOOLEAN bTriedToWakeUpFromShutdown; */
BOOLEAN bLinkDownRequested;
int downloadDDR;
PHS_DEVICE_EXTENSION stBCMPhsContext;
struct bcm_phs_extension stBCMPhsContext;
struct bcm_hdr_suppression_contextinfo stPhsTxContextInfo;
uint8_t ucaPHSPktRestoreBuf[2048];
uint8_t bPHSEnabled;
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/staging/bcm/PHSDefines.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ typedef struct _S_SERVICEFLOW_TABLE {
S_SERVICEFLOW_ENTRY stSFList[MAX_SERVICEFLOWS];
} S_SERVICEFLOW_TABLE;

typedef struct _PHS_DEVICE_EXTENSION {
struct bcm_phs_extension {
/* PHS Specific data */
S_SERVICEFLOW_TABLE *pstServiceFlowPhsRulesTable;
void *CompressedTxBuffer;
void *UnCompressedRxBuffer;
} PHS_DEVICE_EXTENSION, *PPHS_DEVICE_EXTENSION;
};

#endif
20 changes: 10 additions & 10 deletions trunk/drivers/staging/bcm/PHSModule.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ void DumpFullPacket(UCHAR *pBuf,UINT nPktLen)
// TRUE(1) -If allocation of memory was success full.
// FALSE -If allocation of memory fails.
//-----------------------------------------------------------------------------
int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension, struct bcm_mini_adapter *Adapter)
int phs_init(struct bcm_phs_extension *pPhsdeviceExtension, struct bcm_mini_adapter *Adapter)
{
int i;
S_SERVICEFLOW_TABLE *pstServiceFlowTable;
Expand Down Expand Up @@ -351,7 +351,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension, struct bcm_mini_adapter
}


int PhsCleanup(IN PPHS_DEVICE_EXTENSION pPHSDeviceExt)
int PhsCleanup(IN struct bcm_phs_extension *pPHSDeviceExt)
{
if(pPHSDeviceExt->pstServiceFlowPhsRulesTable)
{
Expand Down Expand Up @@ -402,7 +402,7 @@ ULONG PhsUpdateClassifierRule(IN void* pvContext,



PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;

BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"PHS With Corr2 Changes \n");

Expand Down Expand Up @@ -465,7 +465,7 @@ ULONG PhsDeletePHSRule(IN void* pvContext,IN B_UINT16 uiVcid,IN B_UINT8 u8PHSI)
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);


PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;

BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "======>\n");

Expand Down Expand Up @@ -529,7 +529,7 @@ ULONG PhsDeleteClassifierRule(IN void* pvContext,IN B_UINT16 uiVcid ,IN B_UINT16
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_ENTRY *pstClassifierEntry = NULL;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;

if(pDeviceExtension)
{
Expand Down Expand Up @@ -593,7 +593,7 @@ ULONG PhsDeleteSFRules(IN void* pvContext,IN B_UINT16 uiVcid)
S_SERVICEFLOW_ENTRY *pstServiceFlowEntry = NULL;
S_CLASSIFIER_TABLE *pstClassifierRulesTable = NULL;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL,"====> \n");

if(pDeviceExtension)
Expand Down Expand Up @@ -688,7 +688,7 @@ ULONG PhsCompress(IN void* pvContext,



PPHS_DEVICE_EXTENSION pDeviceExtension= (PPHS_DEVICE_EXTENSION)pvContext;
struct bcm_phs_extension *pDeviceExtension= (struct bcm_phs_extension *)pvContext;


if(pDeviceExtension == NULL)
Expand Down Expand Up @@ -779,8 +779,8 @@ ULONG PhsDeCompress(IN void* pvContext,
S_PHS_RULE *pstPhsRule = NULL;
UINT phsi;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
PPHS_DEVICE_EXTENSION pDeviceExtension=
(PPHS_DEVICE_EXTENSION)pvContext;
struct bcm_phs_extension *pDeviceExtension=
(struct bcm_phs_extension *)pvContext;

*pInHeaderSize = 0;

Expand Down Expand Up @@ -1331,7 +1331,7 @@ static BOOLEAN DerefPhsRule(IN B_UINT16 uiClsId,S_CLASSIFIER_TABLE *psaClassifi
}
}

void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension)
void DumpPhsRules(struct bcm_phs_extension *pDeviceExtension)
{
int i,j,k,l;
struct bcm_mini_adapter *Adapter = GET_BCM_ADAPTER(gblpnetdev);
Expand Down
8 changes: 4 additions & 4 deletions trunk/drivers/staging/bcm/PHSModule.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ void DumpDataPacketHeader(PUCHAR pPkt);

void DumpFullPacket(UCHAR *pBuf,UINT nPktLen);

void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);
void DumpPhsRules(struct bcm_phs_extension *pDeviceExtension);


int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension,struct bcm_mini_adapter *Adapter);
int phs_init(struct bcm_phs_extension *pPhsdeviceExtension,struct bcm_mini_adapter *Adapter);

int PhsCleanup(PPHS_DEVICE_EXTENSION pPHSDeviceExt);
int PhsCleanup(struct bcm_phs_extension *pPHSDeviceExt);

//Utility Functions
ULONG PhsUpdateClassifierRule(void* pvContext,B_UINT16 uiVcid,B_UINT16 uiClsId,S_PHS_RULE *psPhsRule,B_UINT8 u8AssociatedPHSI );
Expand All @@ -44,7 +44,7 @@ BOOLEAN ValidatePHSRule(S_PHS_RULE *psPhsRule);
UINT GetServiceFlowEntry(S_SERVICEFLOW_TABLE *psServiceFlowTable,B_UINT16 uiVcid,S_SERVICEFLOW_ENTRY **ppstServiceFlowEntry);


void DumpPhsRules(PPHS_DEVICE_EXTENSION pDeviceExtension);
void DumpPhsRules(struct bcm_phs_extension *pDeviceExtension);


#endif
2 changes: 1 addition & 1 deletion trunk/drivers/staging/bcm/hostmibs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ INT ProcessGetHostMibs(struct bcm_mini_adapter *Adapter, struct bcm_host_stats_m
S_PHS_RULE *pstPhsRule = NULL;
S_CLASSIFIER_TABLE *pstClassifierTable = NULL;
S_CLASSIFIER_ENTRY *pstClassifierRule = NULL;
PPHS_DEVICE_EXTENSION pDeviceExtension = (PPHS_DEVICE_EXTENSION) &Adapter->stBCMPhsContext;
struct bcm_phs_extension *pDeviceExtension = (struct bcm_phs_extension *) &Adapter->stBCMPhsContext;

UINT nClassifierIndex = 0, nPhsTableIndex = 0, nSfIndex = 0, uiIndex = 0;

Expand Down

0 comments on commit 321b35d

Please sign in to comment.