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
nexedi
linux
Commits
e055a6e2
Commit
e055a6e2
authored
Jun 26, 2014
by
John W. Linville
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ath-current' of
git://github.com/kvalo/ath
parents
c6bff544
dfa413de
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
19 deletions
+5
-19
drivers/net/wireless/ath/ath10k/core.c
drivers/net/wireless/ath/ath10k/core.c
+5
-1
drivers/net/wireless/ath/ath10k/htt_rx.c
drivers/net/wireless/ath/ath10k/htt_rx.c
+0
-18
No files found.
drivers/net/wireless/ath/ath10k/core.c
View file @
e055a6e2
...
...
@@ -795,7 +795,11 @@ int ath10k_core_start(struct ath10k *ar)
if
(
status
)
goto
err_htc_stop
;
if
(
test_bit
(
ATH10K_FW_FEATURE_WMI_10X
,
ar
->
fw_features
))
ar
->
free_vdev_map
=
(
1
<<
TARGET_10X_NUM_VDEVS
)
-
1
;
else
ar
->
free_vdev_map
=
(
1
<<
TARGET_NUM_VDEVS
)
-
1
;
INIT_LIST_HEAD
(
&
ar
->
arvifs
);
if
(
!
test_bit
(
ATH10K_FLAG_FIRST_BOOT_DONE
,
&
ar
->
dev_flags
))
...
...
drivers/net/wireless/ath/ath10k/htt_rx.c
View file @
e055a6e2
...
...
@@ -312,7 +312,6 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
int
msdu_len
,
msdu_chaining
=
0
;
struct
sk_buff
*
msdu
;
struct
htt_rx_desc
*
rx_desc
;
bool
corrupted
=
false
;
lockdep_assert_held
(
&
htt
->
rx_ring
.
lock
);
...
...
@@ -439,9 +438,6 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
last_msdu
=
__le32_to_cpu
(
rx_desc
->
msdu_end
.
info0
)
&
RX_MSDU_END_INFO0_LAST_MSDU
;
if
(
msdu_chaining
&&
!
last_msdu
)
corrupted
=
true
;
if
(
last_msdu
)
{
msdu
->
next
=
NULL
;
break
;
...
...
@@ -456,20 +452,6 @@ static int ath10k_htt_rx_amsdu_pop(struct ath10k_htt *htt,
if
(
*
head_msdu
==
NULL
)
msdu_chaining
=
-
1
;
/*
* Apparently FW sometimes reports weird chained MSDU sequences with
* more than one rx descriptor. This seems like a bug but needs more
* analyzing. For the time being fix it by dropping such sequences to
* avoid blowing up the host system.
*/
if
(
corrupted
)
{
ath10k_warn
(
"failed to pop chained msdus, dropping
\n
"
);
ath10k_htt_rx_free_msdu_chain
(
*
head_msdu
);
*
head_msdu
=
NULL
;
*
tail_msdu
=
NULL
;
msdu_chaining
=
-
EINVAL
;
}
/*
* Don't refill the ring yet.
*
...
...
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