Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 255814
b: refs/heads/master
c: 9c05044
h: refs/heads/master
v: v3
  • Loading branch information
Mike McCormack authored and John W. Linville committed Jun 20, 2011
1 parent eab82a0 commit bc77d3c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 440ca98fe8407808a9ad8e934f6e28408f546313
refs/heads/master: 9c0504403725ca77153a0bdad2f3bef0a05e32f0
4 changes: 2 additions & 2 deletions trunk/drivers/net/wireless/rtlwifi/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/rtlwifi/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/rtlwifi/wifi.h
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ struct rtl_mac {
int n_channels;
int n_bitrates;

bool offchan_deley;
bool offchan_delay;

/*filters */
u32 rx_conf;
Expand Down

0 comments on commit bc77d3c

Please sign in to comment.