Alice Michael 7f66182263 i40e: fix merge error ...

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

2017-10-06 08:11:31 -07:00

..

i40e_adminq_cmd.h

i40e: redfine I40E_PHY_TYPE_MAX

2017-10-06 08:11:31 -07:00

i40e_adminq.c

i40e: Stop dropping 802.1ad tags - eth proto 0x88a8

2017-10-02 12:46:36 -07:00

i40e_adminq.h

i40e: reduce wait time for adminq command completion

2017-04-19 17:38:25 -07:00

i40e_alloc.h

…

i40e_client.c

i40e: use dev_dbg instead of dev_info when warning about missing routine

2017-06-20 18:17:10 -07:00

i40e_client.h

i40e: KISS the client interface

2017-03-15 01:57:08 -07:00

i40e_common.c

i40e: Stop dropping 802.1ad tags - eth proto 0x88a8

2017-10-02 12:46:36 -07:00

i40e_dcb_nl.c

i40e: Change some messages from info to debug only

2015-10-15 01:58:41 -07:00

i40e_dcb.c

i40e: Support firmware CEE DCB UP to TC map re-definition

2017-06-20 18:17:10 -07:00

i40e_dcb.h

i40e: Add parsing for CEE DCBX TLVs

2015-10-08 15:11:38 -07:00

i40e_debugfs.c

i40e/i40evf: use DECLARE_BITMAP for state

2017-10-06 08:11:31 -07:00

i40e_devids.h

i40e: Add support for 25G devices

2016-12-06 20:59:43 -08:00

i40e_diag.c

i40e: use BIT and BIT_ULL macros

2015-07-23 05:33:55 -07:00

i40e_diag.h

…

i40e_ethtool.c

i40e: add private flag to control source pruning

2017-10-06 08:11:31 -07:00

i40e_fcoe.c

networking: make skb_put & friends return void pointers

2017-06-16 11:48:39 -04:00

i40e_fcoe.h

i40e: use BIT and BIT_ULL macros

2015-07-23 05:33:55 -07:00

i40e_hmc.c

i40e: fix an uninitialized variable bug

2016-05-14 00:21:51 -07:00

i40e_hmc.h

i40e: use BIT and BIT_ULL macros

2015-07-23 05:33:55 -07:00

i40e_lan_hmc.c

i40e: use explicit cast from u16 to u8

2015-12-12 21:08:26 -08:00

i40e_lan_hmc.h

…

i40e_main.c

i40e: fix merge error

2017-10-06 08:11:31 -07:00

i40e_nvm.c

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-queue

2017-09-05 20:03:40 -07:00

i40e_osdep.h

i40e: Drop FCoE code from core driver files

2017-03-27 16:47:43 -07:00

i40e_prototype.h

i40e: Add support for 'ethtool -m'

2017-10-02 12:46:35 -07:00

i40e_ptp.c

i40e: separate hw_features from runtime changing flags

2017-08-25 14:46:15 -07:00

i40e_register.h

i40e: fix incorrect register definition

2017-10-06 08:11:31 -07:00

i40e_status.h

…

i40e_trace.h

i40e/i40evf: Add tracepoints

2017-04-19 16:47:31 -07:00

i40e_txrx.c

i40e/i40evf: rename bytes_per_int to bytes_per_usec

2017-09-29 12:50:58 -07:00

i40e_txrx.h

i40e/i40evf: use DECLARE_BITMAP for state

2017-10-06 08:11:31 -07:00

i40e_type.h

i40e: Stop dropping 802.1ad tags - eth proto 0x88a8

2017-10-02 12:46:36 -07:00

i40e_virtchnl_pf.c

i40e: fix client notify of VF reset

2017-10-02 12:46:36 -07:00

i40e_virtchnl_pf.h

i40e: fix handling of vf_states variable

2017-10-02 12:46:35 -07:00

i40e.h

i40e: add private flag to control source pruning

2017-10-06 08:11:31 -07:00

Makefile

i40e/i40evf: Add tracepoints

2017-04-19 16:47:31 -07:00