summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2011-02-11 09:58:38 +0000
committerbz <bz@FreeBSD.org>2011-02-11 09:58:38 +0000
commitf7bc6ac84227745b06da42dbe3128694ce694f0b (patch)
tree69405dd621cf05d06d273f72c8ab525420887ed9
parentf7710268a23676069049c773e8c8a4b0caff7fa5 (diff)
downloadFreeBSD-src-f7bc6ac84227745b06da42dbe3128694ce694f0b.zip
FreeBSD-src-f7bc6ac84227745b06da42dbe3128694ce694f0b.tar.gz
After r218530 export several functions which are no longer private to
e1000_mac.c but part of the e1000_api. X-MFC with: 218530 by jfv
-rw-r--r--sys/dev/e1000/e1000_api.h3
-rw-r--r--sys/dev/e1000/e1000_mac.c9
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/e1000/e1000_api.h b/sys/dev/e1000/e1000_api.h
index 2621a6e..18b7e7b 100644
--- a/sys/dev/e1000/e1000_api.h
+++ b/sys/dev/e1000/e1000_api.h
@@ -120,6 +120,9 @@ s32 e1000_mng_write_cmd_header(struct e1000_hw *hw,
s32 e1000_mng_write_dhcp_info(struct e1000_hw * hw,
u8 *buffer, u16 length);
u32 e1000_translate_register_82542(u32 reg);
+s32 e1000_set_default_fc_generic(struct e1000_hw *hw);
+s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw);
+s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw);
/*
* TBI_ACCEPT macro definition:
diff --git a/sys/dev/e1000/e1000_mac.c b/sys/dev/e1000/e1000_mac.c
index 1d6aa9b..bb35816 100644
--- a/sys/dev/e1000/e1000_mac.c
+++ b/sys/dev/e1000/e1000_mac.c
@@ -34,9 +34,6 @@
#include "e1000_api.h"
-static s32 e1000_set_default_fc_generic(struct e1000_hw *hw);
-static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw);
-static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw);
static s32 e1000_validate_mdi_setting_generic(struct e1000_hw *hw);
static void e1000_set_lan_id_multi_port_pcie(struct e1000_hw *hw);
@@ -1097,7 +1094,7 @@ void e1000_config_collision_dist_generic(struct e1000_hw *hw)
* Polls for link up by reading the status register, if link fails to come
* up with auto-negotiation, then the link is forced if a signal is detected.
**/
-static s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
+s32 e1000_poll_fiber_serdes_link_generic(struct e1000_hw *hw)
{
struct e1000_mac_info *mac = &hw->mac;
u32 i, status;
@@ -1149,7 +1146,7 @@ out:
* Write the flow control settings to the Transmit Config Word Register (TXCW)
* base on the flow control settings in e1000_mac_info.
**/
-static s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
+s32 e1000_commit_fc_settings_generic(struct e1000_hw *hw)
{
struct e1000_mac_info *mac = &hw->mac;
u32 txcw;
@@ -1264,7 +1261,7 @@ s32 e1000_set_fc_watermarks_generic(struct e1000_hw *hw)
* Read the EEPROM for the default values for flow control and store the
* values.
**/
-static s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
+s32 e1000_set_default_fc_generic(struct e1000_hw *hw)
{
s32 ret_val = E1000_SUCCESS;
u16 nvm_data;
OpenPOWER on IntegriCloud