Messages in this thread | | | From | "Brown, Aaron F" <> | Subject | Re: [PATCH 1/2 v3] ixgbe: define IXGBE_MAX_VFS_DRV_LIMIT macro and cleanup const 63 | Date | Wed, 15 Jan 2014 22:00:29 +0000 |
| |
On Wed, 2014-01-15 at 22:12 +0800, Ethan Zhao wrote: > Because ixgbe driver limit the max number of VF functions could be enabled > to 63, so define one macro IXGBE_MAX_VFS_DRV_LIMIT and cleanup the const 63 > in code. > > v2: fix a typo. > v3: fix a encoding issue. > > Signed-off-by: Ethan Zhao <ethan.kernel@gmail.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 ++-- > drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 5 +++-- > drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 5 +++++ > 3 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > index 0ade0cd..47e9b44 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > @@ -4818,7 +4818,7 @@ static int ixgbe_sw_init(struct ixgbe_adapter *adapter) > #ifdef CONFIG_PCI_IOV > /* assign number of SR-IOV VFs */ > if (hw->mac.type != ixgbe_mac_82598EB) > - adapter->num_vfs = (max_vfs > 63) ? 0 : max_vfs;
Unfortunately the if statement got changed considerably with a recent commit:
commit 170e85430bcbe4d18e81b5a70bb163c741381092 ixgbe: add warning when max_vfs is out of range.
And the pattern no longer exists to make a match. In other words, this patch no longer applies to net-next and I have to ask you for yet another spin if you still want to squash the magic number.
Thanks, Aaron
| |