| if_em.c (235256) | if_em.c (238148) |
|---|---|
| 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: head/sys/dev/e1000/if_em.c 235256 2012-05-11 03:15:22Z kevlo $*/ | 33/*$FreeBSD: head/sys/dev/e1000/if_em.c 238148 2012-07-05 20:26:57Z jfv $*/ |
| 34 35#ifdef HAVE_KERNEL_OPTION_HEADERS 36#include "opt_device_polling.h" 37#include "opt_inet.h" 38#include "opt_inet6.h" 39#endif 40 41#include <sys/param.h> --- 591 unchanged lines hidden (view full) --- 633 /* Check SOL/IDER usage */ 634 if (e1000_check_reset_block(hw)) 635 device_printf(dev, "PHY reset is blocked" 636 " due to SOL/IDER session.\n"); 637 638 /* Sysctl for setting Energy Efficient Ethernet */ 639 em_set_sysctl_value(adapter, "eee_control", 640 "enable Energy Efficient Ethernet", | 34 35#ifdef HAVE_KERNEL_OPTION_HEADERS 36#include "opt_device_polling.h" 37#include "opt_inet.h" 38#include "opt_inet6.h" 39#endif 40 41#include <sys/param.h> --- 591 unchanged lines hidden (view full) --- 633 /* Check SOL/IDER usage */ 634 if (e1000_check_reset_block(hw)) 635 device_printf(dev, "PHY reset is blocked" 636 " due to SOL/IDER session.\n"); 637 638 /* Sysctl for setting Energy Efficient Ethernet */ 639 em_set_sysctl_value(adapter, "eee_control", 640 "enable Energy Efficient Ethernet", |
| 641 &hw->dev_spec.ich8lan.eee_disable, eee_setting); | 641 (int *)&hw->dev_spec.ich8lan.eee_disable, eee_setting); |
| 642 643 /* 644 ** Start from a known state, this is 645 ** important in reading the nvm and 646 ** mac from that. 647 */ 648 e1000_reset_hw(hw); 649 --- 5107 unchanged lines hidden --- | 642 643 /* 644 ** Start from a known state, this is 645 ** important in reading the nvm and 646 ** mac from that. 647 */ 648 e1000_reset_hw(hw); 649 --- 5107 unchanged lines hidden --- |