From c5da78bfcb01a65c4189de026326fb387db66247 Mon Sep 17 00:00:00 2001
From: "Huang, Xiong" <xiong@qca.qualcomm.com>
Date: Tue, 17 Apr 2012 19:32:31 +0000
Subject: [PATCH] --- yaml --- r: 301055 b: refs/heads/master c:
 027392c2d6fe4960eb41fad2baf77c4df651a9cb h: refs/heads/master i:   301053:
 9832fc8442ed70ef17567a66803c6d6c136d96d1   301051:
 55bbe6ba1965b0a848fd4035614312990cf8dc3c   301047:
 936f7442bfddc335344a53860be70ebd069cde48   301039:
 83f601c838df34a44d94a95f0a2b9a5392693858   301023:
 5f5f61df04c702b5a737228c0ae750f5ac1a5501   300991:
 31b88952e775a812c37f0438d8db2f98f4655168   300927:
 4996065920e980383a6c8f83ee460eb51083a1b8   300799:
 f9d7474607c32f134b790b201b5e8fc32e9a3cfb   300543:
 2e7f62b682397611694dc1fc0d112507aec8be2f   300031:
 aa4285495eaa682d2c2eff96b7a1def83d993250   299007:
 b54b3d7783de977fee86ff27b40fa62a289f2ead v: v3

---
 [refs]                                        |  2 +-
 .../net/ethernet/atheros/atl1c/atl1c_hw.h     | 29 ++++++++-----------
 .../net/ethernet/atheros/atl1c/atl1c_main.c   |  3 +-
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index ddd9af31a841..78f4a4a5724c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0af48336704e5b3870e03699b3acf5dd7d7cb8ab
+refs/heads/master: 027392c2d6fe4960eb41fad2baf77c4df651a9cb
diff --git a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
index ca45fadb2d55..18c1f189b6b3 100644
--- a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
+++ b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_hw.h
@@ -493,26 +493,21 @@ int atl1c_phy_power_saving(struct atl1c_hw *hw);
 #define ASPM_THRUPUT_LIMIT_NO		0x00
 #define ASPM_THRUPUT_LIMIT_1M		0x01
 #define ASPM_THRUPUT_LIMIT_10M		0x02
-#define ASPM_THRUPUT_LIMIT_100M		0x04
-#define RXQ1_CTRL_EN			0x10
-#define RXQ2_CTRL_EN			0x20
-#define RXQ3_CTRL_EN			0x40
-#define IPV6_CHKSUM_CTRL_EN		0x80
-#define RSS_HASH_BITS_MASK		0x00FF
-#define RSS_HASH_BITS_SHIFT		8
-#define RSS_HASH_IPV4			0x10000
-#define RSS_HASH_IPV4_TCP		0x20000
-#define RSS_HASH_IPV6			0x40000
-#define RSS_HASH_IPV6_TCP		0x80000
+#define ASPM_THRUPUT_LIMIT_100M		0x03
+#define IPV6_CHKSUM_CTRL_EN		BIT(7)
 #define RXQ_RFD_BURST_NUM_MASK		0x003F
 #define RXQ_RFD_BURST_NUM_SHIFT		20
-#define RSS_MODE_MASK			0x0003
+#define RXQ_NUM_RFD_PREF_DEF		8
+#define RSS_MODE_MASK			3UL
 #define RSS_MODE_SHIFT			26
-#define RSS_NIP_QUEUE_SEL_MASK		0x1
-#define RSS_NIP_QUEUE_SEL_SHIFT		28
-#define RRS_HASH_CTRL_EN		0x20000000
-#define RX_CUT_THRU_EN			0x40000000
-#define RXQ_CTRL_EN			0x80000000
+#define RSS_MODE_DIS			0
+#define RSS_MODE_SQSI			1
+#define RSS_MODE_MQSI			2
+#define RSS_MODE_MQMI			3
+#define RSS_NIP_QUEUE_SEL		BIT(28) /* 0:q0, 1:table */
+#define RRS_HASH_CTRL_EN		BIT(29)
+#define RX_CUT_THRU_EN			BIT(30)
+#define RXQ_CTRL_EN			BIT(31)
 
 #define REG_RFD_FREE_THRESH		0x15A4
 #define RFD_FREE_THRESH_MASK		0x003F
diff --git a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
index 74203ea9ae18..00c8bd1c791d 100644
--- a/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
+++ b/trunk/drivers/net/ethernet/atheros/atl1c/atl1c_main.c
@@ -1137,8 +1137,7 @@ static int atl1c_stop_mac(struct atl1c_hw *hw)
 	u32 data;
 
 	AT_READ_REG(hw, REG_RXQ_CTRL, &data);
-	data &= ~(RXQ1_CTRL_EN | RXQ2_CTRL_EN |
-		  RXQ3_CTRL_EN | RXQ_CTRL_EN);
+	data &= ~RXQ_CTRL_EN;
 	AT_WRITE_REG(hw, REG_RXQ_CTRL, data);
 
 	AT_READ_REG(hw, REG_TXQ_CTRL, &data);