Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
2206c3ab
Commit
2206c3ab
authored
Apr 01, 2013
by
John W. Linville
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-john' of
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
parents
95bc6b84
b8730b40
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
11 deletions
+9
-11
drivers/net/wireless/iwlwifi/dvm/rxon.c
drivers/net/wireless/iwlwifi/dvm/rxon.c
+8
-10
drivers/net/wireless/iwlwifi/dvm/tx.c
drivers/net/wireless/iwlwifi/dvm/tx.c
+1
-1
No files found.
drivers/net/wireless/iwlwifi/dvm/rxon.c
View file @
2206c3ab
...
@@ -1419,6 +1419,14 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
...
@@ -1419,6 +1419,14 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
mutex_lock
(
&
priv
->
mutex
);
mutex_lock
(
&
priv
->
mutex
);
if
(
changes
&
BSS_CHANGED_IDLE
&&
bss_conf
->
idle
)
{
/*
* If we go idle, then clearly no "passive-no-rx"
* workaround is needed any more, this is a reset.
*/
iwlagn_lift_passive_no_rx
(
priv
);
}
if
(
unlikely
(
!
iwl_is_ready
(
priv
)))
{
if
(
unlikely
(
!
iwl_is_ready
(
priv
)))
{
IWL_DEBUG_MAC80211
(
priv
,
"leave - not ready
\n
"
);
IWL_DEBUG_MAC80211
(
priv
,
"leave - not ready
\n
"
);
mutex_unlock
(
&
priv
->
mutex
);
mutex_unlock
(
&
priv
->
mutex
);
...
@@ -1450,16 +1458,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
...
@@ -1450,16 +1458,6 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
priv
->
timestamp
=
bss_conf
->
sync_tsf
;
priv
->
timestamp
=
bss_conf
->
sync_tsf
;
ctx
->
staging
.
filter_flags
|=
RXON_FILTER_ASSOC_MSK
;
ctx
->
staging
.
filter_flags
|=
RXON_FILTER_ASSOC_MSK
;
}
else
{
}
else
{
/*
* If we disassociate while there are pending
* frames, just wake up the queues and let the
* frames "escape" ... This shouldn't really
* be happening to start with, but we should
* not get stuck in this case either since it
* can happen if userspace gets confused.
*/
iwlagn_lift_passive_no_rx
(
priv
);
ctx
->
staging
.
filter_flags
&=
~
RXON_FILTER_ASSOC_MSK
;
ctx
->
staging
.
filter_flags
&=
~
RXON_FILTER_ASSOC_MSK
;
if
(
ctx
->
ctxid
==
IWL_RXON_CTX_BSS
)
if
(
ctx
->
ctxid
==
IWL_RXON_CTX_BSS
)
...
...
drivers/net/wireless/iwlwifi/dvm/tx.c
View file @
2206c3ab
...
@@ -1192,7 +1192,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
...
@@ -1192,7 +1192,7 @@ int iwlagn_rx_reply_tx(struct iwl_priv *priv, struct iwl_rx_cmd_buffer *rxb,
memset
(
&
info
->
status
,
0
,
sizeof
(
info
->
status
));
memset
(
&
info
->
status
,
0
,
sizeof
(
info
->
status
));
if
(
status
==
TX_STATUS_FAIL_PASSIVE_NO_RX
&&
if
(
status
==
TX_STATUS_FAIL_PASSIVE_NO_RX
&&
iwl_is_associated_ctx
(
ctx
)
&&
ctx
->
vif
&&
ctx
->
vif
&&
ctx
->
vif
->
type
==
NL80211_IFTYPE_STATION
)
{
ctx
->
vif
->
type
==
NL80211_IFTYPE_STATION
)
{
/* block and stop all queues */
/* block and stop all queues */
priv
->
passive_no_rx
=
true
;
priv
->
passive_no_rx
=
true
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment