Commit 7f661822 authored Aug 29, 2017 by Alice Michael Committed by Jeff Kirsher Oct 06, 2017

i40e: fix merge error



This patch removes some code that was accidentally added to
the wrong function with a merge error.  Fixes: c53934c6
("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>

parent bd6cd4e6

drivers/net/ethernet/intel/i40e/i40e_main.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -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);
		}

		/**