projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'omap_dss2/for-next'
[deliverable/linux.git]
/
drivers
/
net
/
ethernet
/
intel
/
fm10k
/
fm10k_common.c
diff --git
a/drivers/net/ethernet/intel/fm10k/fm10k_common.c
b/drivers/net/ethernet/intel/fm10k/fm10k_common.c
index d6baaea8bc7c1039a1fdf77c250049cfaed2cd34..dd95ac4f4c64ad951ee9998aef337242f38453be 100644
(file)
--- a/
drivers/net/ethernet/intel/fm10k/fm10k_common.c
+++ b/
drivers/net/ethernet/intel/fm10k/fm10k_common.c
@@
-207,6
+207,9
@@
s32 fm10k_disable_queues_generic(struct fm10k_hw *hw, u16 q_cnt)
/* clear tx_ready to prevent any false hits for reset */
hw->mac.tx_ready = false;
+ if (FM10K_REMOVED(hw->hw_addr))
+ return 0;
+
/* clear the enable bit for all rings */
for (i = 0; i < q_cnt; i++) {
reg = fm10k_read_reg(hw, FM10K_TXDCTL(i));
This page took
0.025137 seconds
and
5
git commands to generate.