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
a9ad99a6
Commit
a9ad99a6
authored
Jul 26, 2010
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
c736eefa
f792af25
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
drivers/net/wireless/ath/ath9k/recv.c
drivers/net/wireless/ath/ath9k/recv.c
+2
-2
net/mac80211/cfg.c
net/mac80211/cfg.c
+1
-1
No files found.
drivers/net/wireless/ath/ath9k/recv.c
View file @
a9ad99a6
...
@@ -844,9 +844,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
...
@@ -844,9 +844,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
int
dma_type
;
int
dma_type
;
if
(
edma
)
if
(
edma
)
dma_type
=
DMA_FROM_DEVICE
;
else
dma_type
=
DMA_BIDIRECTIONAL
;
dma_type
=
DMA_BIDIRECTIONAL
;
else
dma_type
=
DMA_FROM_DEVICE
;
qtype
=
hp
?
ATH9K_RX_QUEUE_HP
:
ATH9K_RX_QUEUE_LP
;
qtype
=
hp
?
ATH9K_RX_QUEUE_HP
:
ATH9K_RX_QUEUE_LP
;
spin_lock_bh
(
&
sc
->
rx
.
rxbuflock
);
spin_lock_bh
(
&
sc
->
rx
.
rxbuflock
);
...
...
net/mac80211/cfg.c
View file @
a9ad99a6
...
@@ -632,7 +632,7 @@ static void ieee80211_send_layer2_update(struct sta_info *sta)
...
@@ -632,7 +632,7 @@ static void ieee80211_send_layer2_update(struct sta_info *sta)
skb
->
dev
=
sta
->
sdata
->
dev
;
skb
->
dev
=
sta
->
sdata
->
dev
;
skb
->
protocol
=
eth_type_trans
(
skb
,
sta
->
sdata
->
dev
);
skb
->
protocol
=
eth_type_trans
(
skb
,
sta
->
sdata
->
dev
);
memset
(
skb
->
cb
,
0
,
sizeof
(
skb
->
cb
));
memset
(
skb
->
cb
,
0
,
sizeof
(
skb
->
cb
));
netif_rx
(
skb
);
netif_rx
_ni
(
skb
);
}
}
static
void
sta_apply_parameters
(
struct
ieee80211_local
*
local
,
static
void
sta_apply_parameters
(
struct
ieee80211_local
*
local
,
...
...
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