Patchwork [net-ext] ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined

login
register
mail settings
Submitter Rose, Gregory V
Date Nov. 7, 2011, 5:44 p.m.
Message ID <20111107174417.8638.87569.stgit@gitlad.jf.intel.com>
Download mbox | patch
Permalink /patch/124155/
State Accepted
Delegated to: David Miller
Headers show

Comments

Rose, Gregory V - Nov. 7, 2011, 5:44 p.m.
Fix compiler errors and warnings with CONFIG_PCI_IOV defined and not
defined.

Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
---

 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c |    2 ++
 drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Nov. 7, 2011, 6:23 p.m.
From: Greg Rose <gregory.v.rose@intel.com>
Date: Mon, 07 Nov 2011 09:44:17 -0800

> Fix compiler errors and warnings with CONFIG_PCI_IOV defined and not
> defined.
> 
> Signed-off-by: Greg Rose <gregory.v.rose@intel.com>

It's "net-next" not "net-ext" :-)

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rose, Gregory V - Nov. 7, 2011, 6:25 p.m.
> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Monday, November 07, 2011 10:24 AM
> To: Rose, Gregory V
> Cc: netdev@vger.kernel.org
> Subject: Re: [net-ext PATCH] ixgbe: Fix compile for kernel without
> CONFIG_PCI_IOV defined
> 
> From: Greg Rose <gregory.v.rose@intel.com>
> Date: Mon, 07 Nov 2011 09:44:17 -0800
> 
> > Fix compiler errors and warnings with CONFIG_PCI_IOV defined and not
> > defined.
> >
> > Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
> 
> It's "net-next" not "net-ext" :-)
> 
> Applied, thanks.

Ugh... I'm really stepping in it deep.

Thanks Dave,

- Greg

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
index db95731..00fcd39 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c
@@ -442,12 +442,14 @@  static int ixgbe_set_vf_macvlan(struct ixgbe_adapter *adapter,
 
 int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter)
 {
+#ifdef CONFIG_PCI_IOV
 	int i;
 	for (i = 0; i < adapter->num_vfs; i++) {
 		if (adapter->vfinfo[i].vfdev->dev_flags &
 				PCI_DEV_FLAGS_ASSIGNED)
 			return true;
 	}
+#endif
 	return false;
 }
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
index 4a5d889..df04f1a 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h
@@ -42,11 +42,11 @@  int ixgbe_ndo_set_vf_spoofchk(struct net_device *netdev, int vf, bool setting);
 int ixgbe_ndo_get_vf_config(struct net_device *netdev,
 			    int vf, struct ifla_vf_info *ivi);
 void ixgbe_check_vf_rate_limit(struct ixgbe_adapter *adapter);
-#ifdef CONFIG_PCI_IOV
 void ixgbe_disable_sriov(struct ixgbe_adapter *adapter);
+int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter);
+#ifdef CONFIG_PCI_IOV
 void ixgbe_enable_sriov(struct ixgbe_adapter *adapter,
 			const struct ixgbe_info *ii);
-int ixgbe_check_vf_assignment(struct ixgbe_adapter *adapter);
 #endif