diff options
| author | David S. Miller <[email protected]> | 2014-05-23 20:28:18 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2014-05-23 20:28:18 +0000 |
| commit | 0c3592b821eb4069c8ab3934fc0e78f358d88ae4 (patch) | |
| tree | 56b149cd0d9a8ae957f1fb8ddfa800dde1aeec07 /drivers/net/ethernet/intel/igb/igb_main.c | |
| parent | Merge branch 'mvneta-next' (diff) | |
| parent | i40e,igb,ixgbe: remove usless return statements (diff) | |
| download | kernel-0c3592b821eb4069c8ab3934fc0e78f358d88ae4.tar.gz kernel-0c3592b821eb4069c8ab3934fc0e78f358d88ae4.zip | |
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: David S. Miller <[email protected]>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 1075b3f8c415..ea2868b22c2d 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c @@ -2139,7 +2139,6 @@ void igb_set_fw_version(struct igb_adapter *adapter) } break; } - return; } /** |