diff options
author | Alice Michael <alice.michael@intel.com> | 2017-08-29 05:32:36 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2017-10-06 11:11:31 -0400 |
commit | 7f6618226360b4aa0230a49525c81bf47d1d53c8 (patch) | |
tree | cd6adb7d6bf830ec203bbf06b5ed696c86431d6a | |
parent | bd6cd4e6dd38a35215d3f28f12db51213c9aead6 (diff) |
i40e: fix merge error
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 <alice.michael@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_main.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 49401be7a2f4..628101bb08d4 100644 --- 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) | |||
1776 | vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED; | 1776 | vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED; |
1777 | vsi->back->flags |= I40E_FLAG_FILTER_SYNC; | 1777 | vsi->back->flags |= I40E_FLAG_FILTER_SYNC; |
1778 | } | 1778 | } |
1779 | |||
1780 | /* schedule our worker thread which will take care of | ||
1781 | * applying the new filter changes | ||
1782 | */ | ||
1783 | i40e_service_event_schedule(vsi->back); | ||
1784 | } | 1779 | } |
1785 | 1780 | ||
1786 | /** | 1781 | /** |