projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
bd6cd4e
)
i40e: fix merge error
author
Alice Michael
<
[email protected]
>
Tue, 29 Aug 2017 09:32:36 +0000
(
05:32
-0400)
committer
Jeff Kirsher
<
[email protected]
>
Fri, 6 Oct 2017 15:11:31 +0000
(08:11 -0700)
This patch removes some code that was accidentally added to
the wrong function with a merge error. Fixes:
c53934c6d1b1
("i40e: fix: do not sleep in netdev_ops")
Signed-off-by: Alice Michael <
[email protected]
>
Tested-by: Andrew Bowers <
[email protected]
>
Signed-off-by: Jeff Kirsher <
[email protected]
>
drivers/net/ethernet/intel/i40e/i40e_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/intel/i40e/i40e_main.c
b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 49401be7a2f4c296e34976884af479d8e09ca2e4..628101bb08d43e53fbc2be83734ecfdc348f81f9 100644
(file)
--- a/
drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/
drivers/net/ethernet/intel/i40e/i40e_main.c
@@
-1776,11
+1776,6
@@
static void i40e_set_rx_mode(struct net_device *netdev)
vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED;
vsi->back->flags |= I40E_FLAG_FILTER_SYNC;
}
-
- /* schedule our worker thread which will take care of
- * applying the new filter changes
- */
- i40e_service_event_schedule(vsi->back);
}
/**