d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

After r218530 export several functions which are no longer private to

Browse Source 
e1000_mac.c but part of the e1000_api.

X-MFC with: 218530 by jfv
This commit is contained in:
Bjoern A. Zeeb 2011-02-11 09:58:38 +00:00
parent 12db289af8
commit b60688be0f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/e1000/e1000_api.h
View File

@ -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:

9
sys/dev/e1000/e1000_mac.c
View File

@ -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;