| e1000_82541.c (235527) | e1000_82541.c (238262) |
|---|---|
| 1/****************************************************************************** 2 3 Copyright (c) 2001-2011, 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-2011, 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: stable/9/sys/dev/e1000/e1000_82541.c 235527 2012-05-16 22:22:52Z jfv $*/ | 33/*$FreeBSD: stable/9/sys/dev/e1000/e1000_82541.c 238262 2012-07-08 20:35:56Z jfv $*/ |
| 34 35/* 36 * 82541EI Gigabit Ethernet Controller 37 * 82541ER Gigabit Ethernet Controller 38 * 82541GI Gigabit Ethernet Controller 39 * 82541PI Gigabit Ethernet Controller 40 * 82547EI Gigabit Ethernet Controller 41 * 82547GI Gigabit Ethernet Controller --- 595 unchanged lines hidden (view full) --- 637 638 ret_val = e1000_config_dsp_after_link_change_82541(hw, TRUE); 639 640 /* 641 * Auto-Neg is enabled. Auto Speed Detection takes care 642 * of MAC speed/duplex configuration. So we only need to 643 * configure Collision Distance in the MAC. 644 */ | 34 35/* 36 * 82541EI Gigabit Ethernet Controller 37 * 82541ER Gigabit Ethernet Controller 38 * 82541GI Gigabit Ethernet Controller 39 * 82541PI Gigabit Ethernet Controller 40 * 82547EI Gigabit Ethernet Controller 41 * 82547GI Gigabit Ethernet Controller --- 595 unchanged lines hidden (view full) --- 637 638 ret_val = e1000_config_dsp_after_link_change_82541(hw, TRUE); 639 640 /* 641 * Auto-Neg is enabled. Auto Speed Detection takes care 642 * of MAC speed/duplex configuration. So we only need to 643 * configure Collision Distance in the MAC. 644 */ |
| 645 e1000_config_collision_dist_generic(hw); | 645 mac->ops.config_collision_dist(hw); |
| 646 647 /* 648 * Configure Flow Control now that Auto-Neg has completed. 649 * First, we need to restore the desired flow control 650 * settings because we may have had to re-autoneg with a 651 * different link partner. 652 */ 653 ret_val = e1000_config_fc_after_link_up_generic(hw); --- 672 unchanged lines hidden --- | 646 647 /* 648 * Configure Flow Control now that Auto-Neg has completed. 649 * First, we need to restore the desired flow control 650 * settings because we may have had to re-autoneg with a 651 * different link partner. 652 */ 653 ret_val = e1000_config_fc_after_link_up_generic(hw); --- 672 unchanged lines hidden --- |