| if_em.c (148636) | if_em.c (148654) |
|---|---|
| 1/************************************************************************** 2 3Copyright (c) 2001-2005, Intel Corporation 4All rights reserved. 5 6Redistribution and use in source and binary forms, with or without 7modification, are permitted provided that the following conditions are met: 8 --- 17 unchanged lines hidden (view full) --- 26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30POSSIBILITY OF SUCH DAMAGE. 31 32***************************************************************************/ 33 | 1/************************************************************************** 2 3Copyright (c) 2001-2005, Intel Corporation 4All rights reserved. 5 6Redistribution and use in source and binary forms, with or without 7modification, are permitted provided that the following conditions are met: 8 --- 17 unchanged lines hidden (view full) --- 26SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 27INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 28CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 29ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 30POSSIBILITY OF SUCH DAMAGE. 31 32***************************************************************************/ 33 |
| 34/*$FreeBSD: head/sys/dev/em/if_em.c 148636 2005-08-02 08:44:45Z ru $*/ | 34/*$FreeBSD: head/sys/dev/em/if_em.c 148654 2005-08-03 00:18:35Z rwatson $*/ |
| 35 36#include <dev/em/if_em.h> 37 38/********************************************************************* 39 * Set this to one to display debug statistics 40 *********************************************************************/ 41int em_display_debug_stats = 0; 42 --- 1548 unchanged lines hidden (view full) --- 1591 reg_rctl = E1000_READ_REG(&adapter->hw, RCTL); 1592 if (adapter->hw.pci_cmd_word & CMD_MEM_WRT_INVALIDATE) { 1593 em_pci_clear_mwi(&adapter->hw); 1594 } 1595 reg_rctl |= E1000_RCTL_RST; 1596 E1000_WRITE_REG(&adapter->hw, RCTL, reg_rctl); 1597 msec_delay(5); 1598 } | 35 36#include <dev/em/if_em.h> 37 38/********************************************************************* 39 * Set this to one to display debug statistics 40 *********************************************************************/ 41int em_display_debug_stats = 0; 42 --- 1548 unchanged lines hidden (view full) --- 1591 reg_rctl = E1000_READ_REG(&adapter->hw, RCTL); 1592 if (adapter->hw.pci_cmd_word & CMD_MEM_WRT_INVALIDATE) { 1593 em_pci_clear_mwi(&adapter->hw); 1594 } 1595 reg_rctl |= E1000_RCTL_RST; 1596 E1000_WRITE_REG(&adapter->hw, RCTL, reg_rctl); 1597 msec_delay(5); 1598 } |
| 1599 | 1599 1600 IF_ADDR_LOCK(ifp); |
| 1600#if __FreeBSD_version < 500000 1601 LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { 1602#else 1603 TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { 1604#endif 1605 if (ifma->ifma_addr->sa_family != AF_LINK) 1606 continue; 1607 1608 if (mcnt == MAX_NUM_MULTICAST_ADDRESSES) break; 1609 1610 bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr), 1611 &mta[mcnt*ETH_LENGTH_OF_ADDRESS], ETH_LENGTH_OF_ADDRESS); 1612 mcnt++; 1613 } | 1601#if __FreeBSD_version < 500000 1602 LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { 1603#else 1604 TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { 1605#endif 1606 if (ifma->ifma_addr->sa_family != AF_LINK) 1607 continue; 1608 1609 if (mcnt == MAX_NUM_MULTICAST_ADDRESSES) break; 1610 1611 bcopy(LLADDR((struct sockaddr_dl *)ifma->ifma_addr), 1612 &mta[mcnt*ETH_LENGTH_OF_ADDRESS], ETH_LENGTH_OF_ADDRESS); 1613 mcnt++; 1614 } |
| 1615 IF_ADDR_UNLOCK(ifp); |
|
| 1614 1615 if (mcnt >= MAX_NUM_MULTICAST_ADDRESSES) { 1616 reg_rctl = E1000_READ_REG(&adapter->hw, RCTL); 1617 reg_rctl |= E1000_RCTL_MPE; 1618 E1000_WRITE_REG(&adapter->hw, RCTL, reg_rctl); 1619 } else 1620 em_mc_addr_list_update(&adapter->hw, mta, mcnt, 0, 1); 1621 --- 1838 unchanged lines hidden --- | 1616 1617 if (mcnt >= MAX_NUM_MULTICAST_ADDRESSES) { 1618 reg_rctl = E1000_READ_REG(&adapter->hw, RCTL); 1619 reg_rctl |= E1000_RCTL_MPE; 1620 E1000_WRITE_REG(&adapter->hw, RCTL, reg_rctl); 1621 } else 1622 em_mc_addr_list_update(&adapter->hw, mta, mcnt, 0, 1); 1623 --- 1838 unchanged lines hidden --- |