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
cf991116
Commit
cf991116
authored
Aug 14, 2009
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
parents
deeb16dc
88512935
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
drivers/net/ixgbe/ixgbe_fcoe.c
drivers/net/ixgbe/ixgbe_fcoe.c
+1
-1
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_main.c
+2
-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/ixgbe/ixgbe_fcoe.c
View file @
cf991116
...
...
@@ -336,7 +336,7 @@ int ixgbe_fcoe_ddp(struct ixgbe_adapter *adapter,
/* return 0 to bypass going to ULD for DDPed data */
if
(
fcstat
==
IXGBE_RXDADV_STAT_FCSTAT_DDP
)
rc
=
0
;
else
else
if
(
ddp
->
len
)
rc
=
ddp
->
len
;
}
...
...
drivers/net/ixgbe/ixgbe_main.c
View file @
cf991116
...
...
@@ -494,12 +494,12 @@ static void ixgbe_receive_skb(struct ixgbe_q_vector *q_vector,
skb_record_rx_queue
(
skb
,
ring
->
queue_index
);
if
(
!
(
adapter
->
flags
&
IXGBE_FLAG_IN_NETPOLL
))
{
if
(
adapter
->
vlgrp
&&
is_vlan
&&
(
tag
!=
0
))
if
(
adapter
->
vlgrp
&&
is_vlan
&&
(
tag
&
VLAN_VID_MASK
))
vlan_gro_receive
(
napi
,
adapter
->
vlgrp
,
tag
,
skb
);
else
napi_gro_receive
(
napi
,
skb
);
}
else
{
if
(
adapter
->
vlgrp
&&
is_vlan
&&
(
tag
!=
0
))
if
(
adapter
->
vlgrp
&&
is_vlan
&&
(
tag
&
VLAN_VID_MASK
))
vlan_hwaccel_rx
(
skb
,
adapter
->
vlgrp
,
tag
);
else
netif_rx
(
skb
);
...
...
drivers/net/wireless/rt2x00/rt2x00.h
View file @
cf991116
...
...
@@ -851,13 +851,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 @
cf991116
...
...
@@ -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
);
/* copy over remaining packets */
...
...
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