tg3: Fix eee preprocessor naming

Matt Carlson · davem330 · commit d7f2ab204324 · 2011-01-25T19:38:20.000-08:00
This patch fixes a preprocessor naming bug for one of the EEE registers.

Signed-off-by: Matt Carlson &lt;mcarlson@broadcom.com&gt;
Reviewed-by: Michael Chan &lt;mchan@broadcom.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
@@ -7829,7 +7829,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 		       TG3_CPMU_DBTMR1_LNKIDLE_2047US);
 
 		tw32_f(TG3_CPMU_EEE_DBTMR2,
-		       TG3_CPMU_DBTMR1_APE_TX_2047US |
+		       TG3_CPMU_DBTMR2_APE_TX_2047US |
 		       TG3_CPMU_DBTMR2_TXIDXEQ_2047US);
 	}
 
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
@@ -1106,7 +1106,7 @@
 #define  TG3_CPMU_DBTMR1_PCIEXIT_2047US	 0x07ff0000
 #define  TG3_CPMU_DBTMR1_LNKIDLE_2047US	 0x000070ff
 #define TG3_CPMU_EEE_DBTMR2		0x000036b8
-#define  TG3_CPMU_DBTMR1_APE_TX_2047US	 0x07ff0000
+#define  TG3_CPMU_DBTMR2_APE_TX_2047US	 0x07ff0000
 #define  TG3_CPMU_DBTMR2_TXIDXEQ_2047US	 0x000070ff
 #define TG3_CPMU_EEE_LNKIDL_CTRL	0x000036bc
 #define  TG3_CPMU_EEE_LNKIDL_PCIE_NL0	 0x01000000

Original file line number	Diff line number	Diff line change
`@@ -7829,7 +7829,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)`
`7829`	`7829`	`TG3_CPMU_DBTMR1_LNKIDLE_2047US);`
`7830`	`7830`
`7831`	`7831`	`tw32_f(TG3_CPMU_EEE_DBTMR2,`
`7832`		`- TG3_CPMU_DBTMR1_APE_TX_2047US \|`
	`7832`	`+ TG3_CPMU_DBTMR2_APE_TX_2047US \|`
`7833`	`7833`	`TG3_CPMU_DBTMR2_TXIDXEQ_2047US);`
`7834`	`7834`	`}`
`7835`	`7835`