From bbfcfe1096a89e1c384d0d66b89b2373946abed1 Mon Sep 17 00:00:00 2001 From: RongQing Li Date: Tue, 18 Oct 2011 22:52:35 +0000 Subject: [PATCH] --- yaml --- r: 266894 b: refs/heads/master c: 46a016985a442b499faa52dff7e74a79f6a22cef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igb/igb_main.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3a8062674b45..ab156a08846a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 924a4c7d2e962b4e6a8e9ab3aabfd2bb29e5ada9 +refs/heads/master: 46a016985a442b499faa52dff7e74a79f6a22cef diff --git a/trunk/drivers/net/ethernet/intel/igb/igb_main.c b/trunk/drivers/net/ethernet/intel/igb/igb_main.c index f9b818267de8..f689aa1b5a37 100644 --- a/trunk/drivers/net/ethernet/intel/igb/igb_main.c +++ b/trunk/drivers/net/ethernet/intel/igb/igb_main.c @@ -162,9 +162,12 @@ static int igb_ndo_set_vf_bw(struct net_device *netdev, int vf, int tx_rate); static int igb_ndo_get_vf_config(struct net_device *netdev, int vf, struct ifla_vf_info *ivi); static void igb_check_vf_rate_limit(struct igb_adapter *); + +#ifdef CONFIG_PCI_IOV static int igb_vf_configure(struct igb_adapter *adapter, int vf); static int igb_find_enabled_vfs(struct igb_adapter *adapter); static int igb_check_vf_assignment(struct igb_adapter *adapter); +#endif #ifdef CONFIG_PM static int igb_suspend(struct pci_dev *, pm_message_t);