Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324607
b: refs/heads/master
c: ae0c514
h: refs/heads/master
i:
  324605: 73a1550
  324603: 7e2957d
  324599: d045000
  324591: 3ba5790
  324575: ac90a05
  324543: f5ea9b5
  324479: ea7ca3e
  324351: 1bcfbc7
  324095: 3da3b06
  323583: 375e9e5
v: v3
  • Loading branch information
Masanari Iida authored and Greg Kroah-Hartman committed Aug 17, 2012
1 parent 3d59215 commit 3e275cd
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ac9bbd085f5d22a2f01a03cb79abe740412bdae1
refs/heads/master: ae0c514cce96fa8eb68f1fdb1563eba1ff61056f
4 changes: 2 additions & 2 deletions trunk/drivers/staging/bcm/PHSModule.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Input parameters: IN struct bcm_mini_adapter *Adapter - Miniport Adapte
BOOLEAN bHeaderSuppressionEnabled - indicates if header suprression is enabled for SF.
Return: STATUS_SUCCESS - If the send was successful.
Other - If an error occured.
Other - If an error occurred.
*/

int PHSTransmit(struct bcm_mini_adapter *Adapter,
Expand Down Expand Up @@ -346,7 +346,7 @@ int phs_init(PPHS_DEVICE_EXTENSION pPhsdeviceExtension, struct bcm_mini_adapter



BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\n phs_init Successfull");
BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, PHS_DISPATCH, DBG_LVL_ALL, "\n phs_init Successful");
return STATUS_SUCCESS;
}

Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/bcm/cntrl_SignalingInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ typedef struct _stServiceFlowParamSI{
/** 8bit Indicates whether or not MBS service is requested for this Serivce Flow*/
B_UINT8 u8MBSService;

/** 8bit QOS Parameter Set specifies proper application of QoS paramters to Provisioned, Admitted and Active sets*/
/** 8bit QOS Parameter Set specifies proper application of QoS parameters to Provisioned, Admitted and Active sets*/
B_UINT8 u8QosParamSet;

/** 8bit Traffic Priority Of the Service Flow */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/bcm/nvm.c
Original file line number Diff line number Diff line change
Expand Up @@ -3932,7 +3932,7 @@ int validateFlash2xReadWrite(struct bcm_mini_adapter *Adapter, PFLASH2X_READWRIT
BcmGetSectionValStartOffset(Adapter, ISO_IMAGE2_PART3);
}

/* since this uiSectEndoffset is the size of iso Image. hence for calculating the vitual endoffset
/* since this uiSectEndoffset is the size of iso Image. hence for calculating the virtual endoffset
* it should be added in startoffset. so that check done in last of this function can be valued.
*/
uiSectEndOffset = uiSectStartOffset + uiSectEndOffset;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/bcm/target_params.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ typedef struct _TARGET_PARAMS
B_UINT32 m_u32PowerSavingModesEnable; //bit 1: 1 Idlemode enable; bit2: 1 Sleepmode Enable
/* PowerSaving Mode Options:
bit 0 = 1: CPE mode - to keep pcmcia if alive;
bit 1 = 1: CINR reporing in Idlemode Msg
bit 1 = 1: CINR reporting in Idlemode Msg
bit 2 = 1: Default PSC Enable in sleepmode*/
B_UINT32 m_u32PowerSavingModeOptions;

Expand Down

0 comments on commit 3e275cd

Please sign in to comment.