Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 874d1a10 authored Sep 03, 2015 by Shannon Nelson Committed by Jeff Kirsher Oct 15, 2015

i40e/i40evf: remove redundant declarations of a variable and a function



Remove a variable declaration inside an if block hiding an existing
declaration at the start of the function.

Also remove a forward function declaration that is no longer needed due
to code re-organization.

Change-ID: I12954668b722718074949c93d74cd20eaacd93e4
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent 106b1941

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -90,9 +90,6 @@ static const struct i40e_stats i40e_gstrings_misc_stats[] = {
		I40E_VSI_STAT("tx_linearize", tx_linearize),
		};

		static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
		struct ethtool_rxnfc *cmd);

		/* These PF_STATs might look like duplicates of some NETDEV_STATs,
		* but they are separate. This device supports Virtualization, and
		* as such might have several netdevs supporting VMDq and FCoE going

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1628,7 +1628,7 @@ static void i40evf_reset_task(struct work_struct *work)
		/* extra wait to make sure minimum wait is met */
		msleep(I40EVF_RESET_WAIT_MS);
		if (i == I40EVF_RESET_WAIT_COUNT) {
		struct i40evf_mac_filter f, ftmp;
		struct i40evf_mac_filter *ftmp;
		struct i40evf_vlan_filter fv, fvtmp;

		/* reset never finished */