> -----Original Message----- > From: netdev-owner@xxxxxxxxxxxxxxx [mailto:netdev-owner@xxxxxxxxxxxxxxx] > On Behalf Of Rose, Gregory V > Sent: Monday, November 07, 2011 8:47 AM > To: Kirsher, Jeffrey T; David Miller > Cc: sfr@xxxxxxxxxxxxxxxx; torvalds@xxxxxxxxxxxxxxxxxxxx; linux- > next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; netdev@xxxxxxxxxxxxxxx > Subject: RE: linux-next: build failure after merge of the origin tree > > > > > -----Original Message----- > > From: Kirsher, Jeffrey T > > Sent: Sunday, November 06, 2011 9:30 PM > > To: David Miller > > Cc: sfr@xxxxxxxxxxxxxxxx; torvalds@xxxxxxxxxxxxxxxxxxxx; linux- > > next@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx; Rose, Gregory V; > > netdev@xxxxxxxxxxxxxxx > > Subject: Re: linux-next: build failure after merge of the origin tree > > > > > > > > Cheers, > > Jeff > > > > On Nov 6, 2011, at 19:38, "David Miller" <davem@xxxxxxxxxxxxx> wrote: > > > > > From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> > > > Date: Mon, 7 Nov 2011 13:47:06 +1100 > > > > > >>> If you just revert the commit in origin from -next, then you will > get > > >>> conflicts with you pull the net.git tree in. > > >> > > >> I got no conflicts when I merged in the net tree and can see no fix > for > > >> this problem in the net tree. My current head of the net tree is > > 1a6422f > > >> "etherh: Add MAINTAINERS entry for etherh". > > > > > > Ok, Jeff please take a look at this and send me a fix soon. > > > > > > Thanks. > > > > Ok Dave, at this point, I am puttying together a patch to revert this > fix > > since it appears that more trouble comes with this fix. I will take a > > look at it quickly before sending out a patch to fix the issue. > > My bad... I fixed a compiler warning that occurred with CONFIG_PCI_IOV > turned on and didn't realize that my patch would cause an error when > turning it back off. > > I'll have it fixed ASAP. > > - Greg I have posted a fix for this problem to netdev and attached it to this email. Again, my apologies for the mix up. - Greg > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html
--- Begin Message ---
- Subject: [net-ext PATCH] ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined
- From: "Rose, Gregory V" <gregory.v.rose@xxxxxxxxx>
- Date: Mon, 7 Nov 2011 09:44:17 -0800
- Cc: "davem@xxxxxxxxxxxxx" <davem@xxxxxxxxxxxxx>
- Thread-index: AcyddOW473jGvoqIRoi0L2fGYAfLWg==
- Thread-topic: [net-ext PATCH] ixgbe: Fix compile for kernel without CONFIG_PCI_IOV defined
- User-agent: StGIT/0.14.2
Fix compiler errors and warnings with CONFIG_PCI_IOV defined and not defined. Signed-off-by: Greg Rose <gregory.v.rose@xxxxxxxxx> --- 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(-) 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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
--- End Message ---
