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

Commit 0c3592b8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains updates to igb, igbvf, ixgbe, i40e and i40evf.

Jacob provides eight patches to cleanup the ixgbe driver to resolve various
checkpatch.pl warnings/errors as well as minor coding style issues.

Stephen Hemminger and I provide simple cleanups of void functions which
had useless return statements at the end of the function which are not
needed.

v2: Dropped Emil's patch "ixgbe: fix the detection of SFP+ capable interfaces"
    while I wait for his updated patch to be validated.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ebb0531b 41457f64

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

+0 −4
Original line number Diff line number Diff line
@@ -6836,7 +6836,6 @@ static void i40e_vsi_delete(struct i40e_vsi *vsi) 
		return;



	i40e_aq_delete_element(&vsi->back->hw, vsi->seid, NULL);

	return;

}



/**
@@ -7576,8 +7575,6 @@ void i40e_veb_release(struct i40e_veb *veb) 


	i40e_aq_delete_element(&pf->hw, veb->seid, NULL);

	i40e_veb_clear(veb);



	return;

}



/**
@@ -8058,7 +8055,6 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) 
	}



	pf->queues_left = queues_left;

	return;

}



/**

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

+0 −4
Original line number Diff line number Diff line
@@ -693,7 +693,6 @@ static void i40evf_del_vlan(struct i40evf_adapter *adapter, u16 vlan) 
		f->remove = true;

		adapter->aq_required |= I40EVF_FLAG_AQ_DEL_VLAN_FILTER;

	}

	return;

}



/**
@@ -1232,8 +1231,6 @@ void i40evf_reset_interrupt_capability(struct i40evf_adapter *adapter) 
	pci_disable_msix(adapter->pdev);

	kfree(adapter->msix_entries);

	adapter->msix_entries = NULL;



	return;

}



/**
@@ -2158,7 +2155,6 @@ err: 
		return; /* do not reschedule */

	}

	schedule_delayed_work(&adapter->init_task, HZ * 3);

	return;

}



/**

drivers/net/ethernet/intel/igb/e1000_nvm.c

+0 −1
Original line number Diff line number Diff line
@@ -798,5 +798,4 @@ etrack_id: 
		fw_vers->etrack_id = (eeprom_verh << NVM_ETRACK_SHIFT)

			| eeprom_verl;

	}

	return;

}

drivers/net/ethernet/intel/igb/igb_main.c

+0 −1
Original line number Diff line number Diff line
@@ -2139,7 +2139,6 @@ void igb_set_fw_version(struct igb_adapter *adapter) 
		}

		break;

	}

	return;

}



/**

drivers/net/ethernet/intel/igbvf/ethtool.c

+0 −1
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ static int igbvf_set_settings(struct net_device *netdev, 
static void igbvf_get_pauseparam(struct net_device *netdev,

                                 struct ethtool_pauseparam *pause)

{

	return;

}



static int igbvf_set_pauseparam(struct net_device *netdev,