Skip to contentSkip to conversation

rtlwifi: Fix typo in variable name

PATCH In review Mike McCormack 2 participants 2 messages Jun 15, 2011 – Jun 17, 2011 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 2/4 rtlwifi: Fix typo in variable name

offchan_deley should be offchan_delay

---
 drivers/net/wireless/rtlwifi/core.c |    4 ++--
 drivers/net/wireless/rtlwifi/pci.c  |    3 +--
 drivers/net/wireless/rtlwifi/wifi.h |    2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)
drivers/net/wireless/rtlwifi/core.c +2 -2
index 605514b..3313ce6 100644
@@ -335,8 +335,8 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
 		 * before going offchannel, or dis-association or delete BA will
 		 * happen by AP
 		 */
-		if (rtlpriv->mac80211.offchan_deley) {
-			rtlpriv->mac80211.offchan_deley = false;
+		if (rtlpriv->mac80211.offchan_delay) {
+			rtlpriv->mac80211.offchan_delay = false;
 			mdelay(50);
 		}
 		rtlphy->current_channel = wide_chan;
drivers/net/wireless/rtlwifi/pci.c +1 -2
index d4c2da8..4195b01 100644
@@ -581,7 +581,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
 		fc = rtl_get_fc(skb);
 		if (ieee80211_is_nullfunc(fc)) {
 			if (ieee80211_has_pm(fc)) {
-				rtlpriv->mac80211.offchan_deley = true;
+				rtlpriv->mac80211.offchan_delay = true;
 				rtlpriv->psc.state_inap = 1;
 			} else {
 				rtlpriv->psc.state_inap = 0;
@@ -788,7 +788,6 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
 {
 	struct ieee80211_hw *hw = dev_id;
 	struct rtl_priv *rtlpriv = rtl_priv(hw);
-	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
 	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
 	unsigned long flags;
 	u32 inta = 0;
drivers/net/wireless/rtlwifi/wifi.h +1 -1
index fcf2c9f..c54cda5 100644
@@ -938,7 +938,7 @@ struct rtl_mac {
 	int n_channels;
 	int n_bitrates;
 
-	bool offchan_deley;
+	bool offchan_delay;
 
 	/*filters */
 	u32 rx_conf;
Signature · 1 line
1.7.4.1
Acked-by on v1 2/4
#1 lore raw
Quoted 50 lines · Mike McCormack

offchan_deley should be offchan_delay

---
  drivers/net/wireless/rtlwifi/core.c |    4 ++--
  drivers/net/wireless/rtlwifi/pci.c  |    3 +--
  drivers/net/wireless/rtlwifi/wifi.h |    2 +-
  3 files changed, 4 insertions(+), 5 deletions(-)
drivers/net/wireless/rtlwifi/core.c +2 -2
index 605514b..3313ce6 100644
@@ -335,8 +335,8 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed)
  		 * before going offchannel, or dis-association or delete BA will
  		 * happen by AP
  		 */
-		if (rtlpriv->mac80211.offchan_deley) {
-			rtlpriv->mac80211.offchan_deley = false;
+		if (rtlpriv->mac80211.offchan_delay) {
+			rtlpriv->mac80211.offchan_delay = false;
  			mdelay(50);
  		}
  		rtlphy->current_channel = wide_chan;
drivers/net/wireless/rtlwifi/pci.c +1 -2
index d4c2da8..4195b01 100644
@@ -581,7 +581,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
  		fc = rtl_get_fc(skb);
  		if (ieee80211_is_nullfunc(fc)) {
  			if (ieee80211_has_pm(fc)) {
-				rtlpriv->mac80211.offchan_deley = true;
+				rtlpriv->mac80211.offchan_delay = true;
  				rtlpriv->psc.state_inap = 1;
  			} else {
  				rtlpriv->psc.state_inap = 0;
@@ -788,7 +788,6 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
  {
  	struct ieee80211_hw *hw = dev_id;
  	struct rtl_priv *rtlpriv = rtl_priv(hw);
-	struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
  	struct rtl_hal *rtlhal = rtl_hal(rtl_priv(hw));
  	unsigned long flags;
  	u32 inta = 0;
drivers/net/wireless/rtlwifi/wifi.h +0 -0
index fcf2c9f..c54cda5 100644

drivers/net/wireless/rtlwifi/wifi.h struct rtl_mac { · line 944

Quoted 8 lines
drivers/net/wireless/rtlwifi/wifi.h +1 -1
@@ -938,7 +938,7 @@ struct rtl_mac {
  	int n_channels;
  	int n_bitrates;
 
-	bool offchan_deley;
+	bool offchan_delay;
 
  	/*filters */
  	u32 rx_conf;