---

yaml --- r: 267771 b: refs/heads/master c: 51ce231 h: refs/heads/master i: 267769: 7471ed4 267767: 4555996 v: v3
git-mirror · Aug 24, 2011 · 0f20ecd · 0f20ecd
1 parent 6ac5cfa
commit 0f20ecd
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aca114d91e726db89d28e56f260b811cc76a3dd
+refs/heads/master: 51ce231f6a77ffc42677e9dea57c5f1d31240ee3
diff --git a/trunk/drivers/staging/rtl8192e/r8192E_phy.c b/trunk/drivers/staging/rtl8192e/r8192E_phy.c
@@ -824,7 +824,7 @@ void rtl8192_SetTxPowerLevel(struct net_device *dev, u8 channel)
 	return;
 }
 u8 rtl8192_phy_SetSwChnlCmdArray(
-	SwChnlCmd*		CmdTable,
+	struct sw_chnl_cmd*		CmdTable,
 	u32			CmdTableIdx,
 	u32			CmdTableSz,
 	SwChnlCmdID		CmdID,
@@ -833,7 +833,7 @@ u8 rtl8192_phy_SetSwChnlCmdArray(
 	u32			msDelay
 	)
 {
-	SwChnlCmd* pCmd;
+	struct sw_chnl_cmd* pCmd;
 
 	if (CmdTable == NULL)
 	{
@@ -858,13 +858,13 @@ u8 rtl8192_phy_SetSwChnlCmdArray(
 u8 rtl8192_phy_SwChnlStepByStep(struct net_device *dev, u8 channel, u8* stage, u8* step, u32* delay)
 {
 	struct r8192_priv *priv = rtllib_priv(dev);
-	SwChnlCmd				PreCommonCmd[MAX_PRECMD_CNT];
+	struct sw_chnl_cmd PreCommonCmd[MAX_PRECMD_CNT];
 	u32					PreCommonCmdCnt;
-	SwChnlCmd				PostCommonCmd[MAX_POSTCMD_CNT];
+	struct sw_chnl_cmd PostCommonCmd[MAX_POSTCMD_CNT];
 	u32					PostCommonCmdCnt;
-	SwChnlCmd				RfDependCmd[MAX_RFDEPENDCMD_CNT];
+	struct sw_chnl_cmd RfDependCmd[MAX_RFDEPENDCMD_CNT];
 	u32					RfDependCmdCnt;
-	SwChnlCmd				*CurrentCmd = NULL;
+	struct sw_chnl_cmd *CurrentCmd = NULL;
 	u8		eRFPath;
 
 	RT_TRACE(COMP_TRACE, "====>%s()====stage:%d, step:%d, channel:%d\n", __func__, *stage, *step, channel);

diff --git a/trunk/drivers/staging/rtl8192e/r8192E_phy.h b/trunk/drivers/staging/rtl8192e/r8192E_phy.h
@@ -58,12 +58,12 @@ typedef enum _SwChnlCmdID {
 } SwChnlCmdID;
 
 /*--------------------------------Define structure--------------------------------*/
-typedef struct _SwChnlCmd {
+struct sw_chnl_cmd {
 	SwChnlCmdID	CmdID;
 	u32			Para1;
 	u32			Para2;
 	u32			msDelay;
-} __attribute__ ((packed)) SwChnlCmd;
+} __packed;
 
 extern u32 rtl819XMACPHY_Array_PG[];
 extern u32 rtl819XPHY_REG_1T2RArray[];