| e1000_82542.c (287990) | e1000_82542.c (295323) |
|---|---|
| 1/****************************************************************************** 2 3 Copyright (c) 2001-2015, Intel Corporation 4 All rights reserved. 5 6 Redistribution and use in source and binary forms, with or without 7 modification, are permitted provided that the following conditions are met: 8 --- 16 unchanged lines hidden (view full) --- 25 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 POSSIBILITY OF SUCH DAMAGE. 31 32******************************************************************************/ | 1/****************************************************************************** 2 3 Copyright (c) 2001-2015, Intel Corporation 4 All rights reserved. 5 6 Redistribution and use in source and binary forms, with or without 7 modification, are permitted provided that the following conditions are met: 8 --- 16 unchanged lines hidden (view full) --- 25 CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 26 SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30 POSSIBILITY OF SUCH DAMAGE. 31 32******************************************************************************/ |
| 33/*$FreeBSD: head/sys/dev/e1000/e1000_82542.c 287990 2015-09-19 18:22:59Z sbruno $*/ | 33/*$FreeBSD: head/sys/dev/e1000/e1000_82542.c 295323 2016-02-05 17:14:37Z erj $*/ |
| 34 35/* 36 * 82542 Gigabit Ethernet Controller 37 */ 38 39#include "e1000_api.h" 40 41static s32 e1000_init_phy_params_82542(struct e1000_hw *hw); --- 270 unchanged lines hidden (view full) --- 312 * control. Calls the appropriate media-specific link configuration 313 * function. Assuming the adapter has a valid link partner, a valid link 314 * should be established. Assumes the hardware has previously been reset 315 * and the transmitter and receiver are not enabled. 316 **/ 317static s32 e1000_setup_link_82542(struct e1000_hw *hw) 318{ 319 struct e1000_mac_info *mac = &hw->mac; | 34 35/* 36 * 82542 Gigabit Ethernet Controller 37 */ 38 39#include "e1000_api.h" 40 41static s32 e1000_init_phy_params_82542(struct e1000_hw *hw); --- 270 unchanged lines hidden (view full) --- 312 * control. Calls the appropriate media-specific link configuration 313 * function. Assuming the adapter has a valid link partner, a valid link 314 * should be established. Assumes the hardware has previously been reset 315 * and the transmitter and receiver are not enabled. 316 **/ 317static s32 e1000_setup_link_82542(struct e1000_hw *hw) 318{ 319 struct e1000_mac_info *mac = &hw->mac; |
| 320 s32 ret_val = E1000_SUCCESS; | 320 s32 ret_val; |
| 321 322 DEBUGFUNC("e1000_setup_link_82542"); 323 324 ret_val = e1000_set_default_fc_generic(hw); 325 if (ret_val) 326 goto out; 327 328 hw->fc.requested_mode &= ~e1000_fc_tx_pause; --- 231 unchanged lines hidden (view full) --- 560} 561 562/** 563 * e1000_read_mac_addr_82542 - Read device MAC address 564 * @hw: pointer to the HW structure 565 * 566 * Reads the device MAC address from the EEPROM and stores the value. 567 **/ | 321 322 DEBUGFUNC("e1000_setup_link_82542"); 323 324 ret_val = e1000_set_default_fc_generic(hw); 325 if (ret_val) 326 goto out; 327 328 hw->fc.requested_mode &= ~e1000_fc_tx_pause; --- 231 unchanged lines hidden (view full) --- 560} 561 562/** 563 * e1000_read_mac_addr_82542 - Read device MAC address 564 * @hw: pointer to the HW structure 565 * 566 * Reads the device MAC address from the EEPROM and stores the value. 567 **/ |
| 568static s32 e1000_read_mac_addr_82542(struct e1000_hw *hw) | 568s32 e1000_read_mac_addr_82542(struct e1000_hw *hw) |
| 569{ 570 s32 ret_val = E1000_SUCCESS; 571 u16 offset, nvm_data, i; 572 573 DEBUGFUNC("e1000_read_mac_addr"); 574 575 for (i = 0; i < ETH_ADDR_LEN; i += 2) { 576 offset = i >> 1; --- 15 unchanged lines hidden --- | 569{ 570 s32 ret_val = E1000_SUCCESS; 571 u16 offset, nvm_data, i; 572 573 DEBUGFUNC("e1000_read_mac_addr"); 574 575 for (i = 0; i < ETH_ADDR_LEN; i += 2) { 576 offset = i >> 1; --- 15 unchanged lines hidden --- |