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
9fe5642f
Commit
9fe5642f
authored
Apr 17, 2012
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/jkirsher/net
parents
d3d4f0a0
b2db497e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
8 deletions
+12
-8
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+10
-0
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+2
-8
No files found.
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
View file @
9fe5642f
...
@@ -622,6 +622,16 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, int v_idx,
...
@@ -622,6 +622,16 @@ static int ixgbe_alloc_q_vector(struct ixgbe_adapter *adapter, int v_idx,
if
(
adapter
->
hw
.
mac
.
type
==
ixgbe_mac_82599EB
)
if
(
adapter
->
hw
.
mac
.
type
==
ixgbe_mac_82599EB
)
set_bit
(
__IXGBE_RX_CSUM_UDP_ZERO_ERR
,
&
ring
->
state
);
set_bit
(
__IXGBE_RX_CSUM_UDP_ZERO_ERR
,
&
ring
->
state
);
#ifdef IXGBE_FCOE
if
(
adapter
->
netdev
->
features
&
NETIF_F_FCOE_MTU
)
{
struct
ixgbe_ring_feature
*
f
;
f
=
&
adapter
->
ring_feature
[
RING_F_FCOE
];
if
((
rxr_idx
>=
f
->
mask
)
&&
(
rxr_idx
<
f
->
mask
+
f
->
indices
))
set_bit
(
__IXGBE_RX_FCOE_BUFSZ
,
&
ring
->
state
);
}
#endif
/* IXGBE_FCOE */
/* apply Rx specific ring traits */
/* apply Rx specific ring traits */
ring
->
count
=
adapter
->
rx_ring_count
;
ring
->
count
=
adapter
->
rx_ring_count
;
ring
->
queue_index
=
rxr_idx
;
ring
->
queue_index
=
rxr_idx
;
...
...
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
View file @
9fe5642f
...
@@ -3154,14 +3154,6 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
...
@@ -3154,14 +3154,6 @@ static void ixgbe_set_rx_buffer_len(struct ixgbe_adapter *adapter)
set_ring_rsc_enabled
(
rx_ring
);
set_ring_rsc_enabled
(
rx_ring
);
else
else
clear_ring_rsc_enabled
(
rx_ring
);
clear_ring_rsc_enabled
(
rx_ring
);
#ifdef IXGBE_FCOE
if
(
netdev
->
features
&
NETIF_F_FCOE_MTU
)
{
struct
ixgbe_ring_feature
*
f
;
f
=
&
adapter
->
ring_feature
[
RING_F_FCOE
];
if
((
i
>=
f
->
mask
)
&&
(
i
<
f
->
mask
+
f
->
indices
))
set_bit
(
__IXGBE_RX_FCOE_BUFSZ
,
&
rx_ring
->
state
);
}
#endif
/* IXGBE_FCOE */
}
}
}
}
...
@@ -4836,7 +4828,9 @@ static int ixgbe_resume(struct pci_dev *pdev)
...
@@ -4836,7 +4828,9 @@ static int ixgbe_resume(struct pci_dev *pdev)
pci_wake_from_d3
(
pdev
,
false
);
pci_wake_from_d3
(
pdev
,
false
);
rtnl_lock
();
err
=
ixgbe_init_interrupt_scheme
(
adapter
);
err
=
ixgbe_init_interrupt_scheme
(
adapter
);
rtnl_unlock
();
if
(
err
)
{
if
(
err
)
{
e_dev_err
(
"Cannot initialize interrupts for device
\n
"
);
e_dev_err
(
"Cannot initialize interrupts for device
\n
"
);
return
err
;
return
err
;
...
...
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