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 <davem@davemloft.net>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user