2011-06-20 01:46:56

by Mike McCormack

Subject: [PATCH 1/3] rtlwifi: Fix typo in variable name

offchan_deley should be offchan_delay

Signed-off-by: Mike McCormack <[email protected]>
Acked-by: Larry Finger <[email protected]>
---
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(-)

diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 605514b..3313ce6 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -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;
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index cb4e5e8..e6d0263 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -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;
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index fcf2c9f..c54cda5 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -938,7 +938,7 @@ struct rtl_mac {
int n_channels;
int n_bitrates;

- bool offchan_deley;
+ bool offchan_delay;

/*filters */
u32 rx_conf;
--
1.7.4.1

2011-06-20 20:01:33

by John W. Linville

Subject: Re: [PATCH 1/3] rtlwifi: Fix typo in variable name

On Mon, Jun 20, 2011 at 10:44:58AM +0900, Mike McCormack wrote:
> offchan_deley should be offchan_delay
>
> Signed-off-by: Mike McCormack <[email protected]>
> Acked-by: Larry Finger <[email protected]>

> @@ -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;

How is this hunk related? It breaks the build...

CC [M] drivers/net/wireless/rtlwifi/pci.o
drivers/net/wireless/rtlwifi/pci.c: In function ‘_rtl_pci_interrupt’:
drivers/net/wireless/rtlwifi/pci.c:796:6: error: ‘rtlpci’ undeclared (first use in this function)
drivers/net/wireless/rtlwifi/pci.c:796:6: note: each undeclared identifier is reported only once for each function it appears in
make[2]: *** [drivers/net/wireless/rtlwifi/pci.o] Error 1
make[1]: *** [drivers/net/wireless/rtlwifi] Error 2
make: *** [drivers/net/wireless/] Error 2

I'll fix it up -- please be more careful.

John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.