From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Don Skidmore <donald.c.skidmore@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, bphilips@novell.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next-2.6 15/16] ixgbe: cleanup ixgbe_init_mbx_params_pf namespace issue
Date: Tue, 8 Feb 2011 04:29:26 -0800 [thread overview]
Message-ID: <1297168167-15755-16-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1297168167-15755-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Don Skidmore <donald.c.skidmore@intel.com>
The function ixgbe_init_mbx_params_pf isn't used unless CONFIG_PCI_IOV
is defined. This is causing namespace warnings. So I wrapped its
definition in CONFIG_PCI_IOV too.
Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Stephen Ko <stephen.s.ko@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ixgbe/ixgbe_mbx.c | 2 ++
drivers/net/ixgbe/ixgbe_mbx.h | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_mbx.c b/drivers/net/ixgbe/ixgbe_mbx.c
index ea82c5a..f215c4c 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.c
+++ b/drivers/net/ixgbe/ixgbe_mbx.c
@@ -437,6 +437,7 @@ out_no_read:
return ret_val;
}
+#ifdef CONFIG_PCI_IOV
/**
* ixgbe_init_mbx_params_pf - set initial values for pf mailbox
* @hw: pointer to the HW structure
@@ -465,6 +466,7 @@ void ixgbe_init_mbx_params_pf(struct ixgbe_hw *hw)
break;
}
}
+#endif /* CONFIG_PCI_IOV */
struct ixgbe_mbx_operations mbx_ops_generic = {
.read = ixgbe_read_mbx_pf,
diff --git a/drivers/net/ixgbe/ixgbe_mbx.h b/drivers/net/ixgbe/ixgbe_mbx.h
index 3df9b15..ada0ce3 100644
--- a/drivers/net/ixgbe/ixgbe_mbx.h
+++ b/drivers/net/ixgbe/ixgbe_mbx.h
@@ -86,7 +86,9 @@ s32 ixgbe_write_mbx(struct ixgbe_hw *, u32 *, u16, u16);
s32 ixgbe_check_for_msg(struct ixgbe_hw *, u16);
s32 ixgbe_check_for_ack(struct ixgbe_hw *, u16);
s32 ixgbe_check_for_rst(struct ixgbe_hw *, u16);
+#ifdef CONFIG_PCI_IOV
void ixgbe_init_mbx_params_pf(struct ixgbe_hw *);
+#endif /* CONFIG_PCI_IOV */
extern struct ixgbe_mbx_operations mbx_ops_generic;
--
1.7.4
next prev parent reply other threads:[~2011-02-08 12:29 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-08 12:29 [net-next-2.6 00/16][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 01/16] e1000e: replace unbounded sprintf with snprintf Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 02/16] e1000e: use correct pointer when memcpy'ing a 2-dimensional array Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 03/16] e1000e: do not wakeup Tx queue until ready Jeff Kirsher
2011-02-08 20:21 ` David Miller
2011-02-08 20:52 ` Allan, Bruce W
2011-02-08 12:29 ` [net-next-2.6 04/16] e1000e: return appropriate errors for 'ethtool -r' Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 05/16] igb: Enable PF side of SR-IOV support for i350 devices Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 06/16] ixgbe: DCB, only reprogram HW if the FCoE priority is changed Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 07/16] ixgbe: DCB, remove round robin mode on 82598 devices Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 08/16] ixgbe: DCB, abstract out dcb_config from DCB hardware configuration Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 09/16] ixgbe: DCB, implement 802.1Qaz routines Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 10/16] ixgbe: DCB, do not reset on CEE pg changes Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 11/16] ixgbe: DCB, remove RESET bit it is no longer needed Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 12/16] ixgbe: dcb, use hardware independent routines Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 13/16] ixgbe: fix namespace issue with ixgbe_dcb_txq_to_tc Jeff Kirsher
2011-02-08 12:29 ` [net-next-2.6 14/16] ixgbe: cleanup namespace complaint by removing little used function Jeff Kirsher
2011-02-08 12:29 ` Jeff Kirsher [this message]
2011-02-08 12:29 ` [net-next-2.6 16/16] ixgbe: Adding 100MB FULL support in ethtool Jeff Kirsher
2011-02-11 15:55 ` [net-next-2.6 00/16][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1297168167-15755-16-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=bphilips@novell.com \
--cc=davem@davemloft.net \
--cc=donald.c.skidmore@intel.com \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).