ixgbe: Drop probe_vf and merge functionality into ixgbe_enable_sriov
authorAlexander Duyck <alexander.h.duyck@intel.com>
Wed, 9 May 2012 08:09:25 +0000 (08:09 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Sat, 21 Jul 2012 23:02:09 +0000 (16:02 -0700)
commit99d744875d01d57d832b8dbfc36d9a1990d503b8
tree993e5373e56d489f5662ea6b4d648697a23e788a
parent186e868786f97c8026f0a81400b451ace306b3a4
ixgbe: Drop probe_vf and merge functionality into ixgbe_enable_sriov

This is meant to fix a bug in which we were not checking for pre-existing
VFs if we were not setting the max_vfs value at driver load.  What happens
now is that we always call ixgbe_enable_sriov and this checks for
pre-existing VFs ore requested VFs prior to deciding on no SR-IOV.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Tested-by: Sibai Li <sibai.li@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c