2007-11-07 06:06:43

by Reinette Chatre

Subject: [PATCH 4/5] remove unused iwl4965_init_hw_rates function

From: Zhu Yi <[email protected]>

The patch removes the unused function to fix a recursive bug caused
by namespace change.

Signed-off-by: Zhu Yi <[email protected]>
Signed-off-by: Reinette Chatre <[email protected]>
---
drivers/net/wireless/iwlwifi/iwl-4965.c | 8 --------
drivers/net/wireless/iwlwifi/iwl4965-base.c | 2 --
2 files changed, 0 insertions(+), 10 deletions(-)

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c
index f7c5ac3..9b8560d 100644
--- a/drivers/net/wireless/iwlwifi/iwl-4965.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965.c
@@ -4269,14 +4269,6 @@ static int iwl4965_tx_queue_agg_disable(struct iwl4965_priv *priv, u16 txq_id,

#endif/* CONFIG_IWL4965_HT_AGG */
#endif /* CONFIG_IWL4965_HT */
-/*
- * RATE SCALE CODE
- */
-int iwl4965_init_hw_rates(struct iwl4965_priv *priv, struct ieee80211_rate *rates)
-{
- return 0;
-}
-

/**
* iwl4965_add_station - Initialize a station's hardware rate table
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 7549224..64366c8 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -5626,8 +5626,6 @@ static void iwl4965_init_hw_rates(struct iwl4965_priv *priv,
if (IWL_BASIC_RATES_MASK & (1 << i))
rates[i].flags |= IEEE80211_RATE_BASIC;
}
-
- iwl4965_init_hw_rates(priv, rates);
}

/**
--
1.5.2.5

2007-11-07 06:06:44

by Reinette Chatre

Subject: [PATCH 5/5] MAINTAINERS: Add Reinette Chatre to iwlwifi & ipw2100/ipw2200

Also fix Zhu Yi's name.

Signed-off-by: Reinette Chatre <[email protected]>
CC: Zhu Yi <[email protected]>
---
MAINTAINERS | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/MAINTAINERS b/MAINTAINERS
index 498e890..f300a65 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2039,10 +2039,12 @@ W: http://sourceforge.net/projects/e1000/
S: Supported

INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
-P: Yi Zhu
+P: Zhu Yi
M: [email protected]
P: James Ketrenos
M: [email protected]
+P: Reinette Chatre
+M: [email protected]
L: [email protected]
L: [email protected]
L: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
@@ -2050,10 +2052,12 @@ W: http://ipw2100.sourceforge.net
S: Supported

INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
-P: Yi Zhu
+P: Zhu Yi
M: [email protected]
P: James Ketrenos
M: [email protected]
+P: Reinette Chatre
+M: [email protected]
L: [email protected]
L: [email protected]
L: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
@@ -2063,6 +2067,8 @@ S: Supported
INTEL WIRELESS WIFI LINK (iwlwifi)
P: Zhu Yi
M: [email protected]
+P: Reinette Chatre
+M: [email protected]
L: [email protected]
L: [email protected]
W: http://intellinuxwireless.org
--
1.5.2.5