Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
88512935
Commit
88512935
authored
Aug 14, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
parents
8a62babf
6b26dead
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
drivers/net/wireless/rt2x00/rt2x00.h
drivers/net/wireless/rt2x00/rt2x00.h
+4
-2
net/mac80211/agg-tx.c
net/mac80211/agg-tx.c
+8
-0
No files found.
drivers/net/wireless/rt2x00/rt2x00.h
View file @
88512935
...
...
@@ -849,13 +849,15 @@ struct rt2x00_dev {
static
inline
void
rt2x00_rf_read
(
struct
rt2x00_dev
*
rt2x00dev
,
const
unsigned
int
word
,
u32
*
data
)
{
*
data
=
rt2x00dev
->
rf
[
word
];
BUG_ON
(
word
<
1
||
word
>
rt2x00dev
->
ops
->
rf_size
/
sizeof
(
u32
));
*
data
=
rt2x00dev
->
rf
[
word
-
1
];
}
static
inline
void
rt2x00_rf_write
(
struct
rt2x00_dev
*
rt2x00dev
,
const
unsigned
int
word
,
u32
data
)
{
rt2x00dev
->
rf
[
word
]
=
data
;
BUG_ON
(
word
<
1
||
word
>
rt2x00dev
->
ops
->
rf_size
/
sizeof
(
u32
));
rt2x00dev
->
rf
[
word
-
1
]
=
data
;
}
/*
...
...
net/mac80211/agg-tx.c
View file @
88512935
...
...
@@ -381,6 +381,14 @@ static void ieee80211_agg_splice_packets(struct ieee80211_local *local,
&
local
->
hw
,
queue
,
IEEE80211_QUEUE_STOP_REASON_AGGREGATION
);
if
(
!
(
sta
->
ampdu_mlme
.
tid_state_tx
[
tid
]
&
HT_ADDBA_REQUESTED_MSK
))
return
;
if
(
WARN
(
!
sta
->
ampdu_mlme
.
tid_tx
[
tid
],
"TID %d gone but expected when splicing aggregates from"
"the pending queue
\n
"
,
tid
))
return
;
if
(
!
skb_queue_empty
(
&
sta
->
ampdu_mlme
.
tid_tx
[
tid
]
->
pending
))
{
spin_lock_irqsave
(
&
local
->
queue_stop_reason_lock
,
flags
);
/* mark queue as pending, it is stopped already */
...
...
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