Date: Fri, 14 Nov 2003 10:43:12 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42348 for review Message-ID: <200311141843.hAEIhCPo057203@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=42348 Change 42348 by peter@peter_overcee on 2003/11/14 10:42:23 IFC @42347 Affected files ... .. //depot/projects/hammer/lib/libc/net/ip6opt.c#4 integrate .. //depot/projects/hammer/share/man/man7/build.7#4 integrate .. //depot/projects/hammer/sys/dev/bge/if_bge.c#24 integrate .. //depot/projects/hammer/sys/dev/ed/if_ed.c#11 integrate .. //depot/projects/hammer/sys/dev/em/if_em.c#19 integrate .. //depot/projects/hammer/sys/dev/em/if_em.h#16 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.c#10 integrate .. //depot/projects/hammer/sys/dev/em/if_em_hw.h#10 integrate .. //depot/projects/hammer/sys/dev/lge/if_lge.c#11 integrate .. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#9 integrate .. //depot/projects/hammer/sys/dev/nge/if_nge.c#11 integrate .. //depot/projects/hammer/sys/dev/re/if_re.c#6 integrate .. //depot/projects/hammer/sys/dev/sn/if_sn.c#10 integrate .. //depot/projects/hammer/sys/dev/tx/if_tx.c#11 integrate .. //depot/projects/hammer/sys/net/pfkeyv2.h#4 integrate .. //depot/projects/hammer/sys/pci/if_dc.c#25 integrate .. //depot/projects/hammer/sys/pci/if_pcn.c#12 integrate .. //depot/projects/hammer/sys/pci/if_rl.c#21 integrate .. //depot/projects/hammer/sys/pci/if_sf.c#13 integrate .. //depot/projects/hammer/sys/pci/if_sis.c#17 integrate .. //depot/projects/hammer/sys/pci/if_sk.c#15 integrate .. //depot/projects/hammer/sys/pci/if_tl.c#11 integrate .. //depot/projects/hammer/sys/pci/if_vr.c#12 integrate .. //depot/projects/hammer/sys/pci/if_wb.c#12 integrate .. //depot/projects/hammer/sys/pci/if_xl.c#26 integrate .. //depot/projects/hammer/sys/vm/uma_core.c#17 integrate .. //depot/projects/hammer/usr.sbin/faithd/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/faithd/README#3 integrate .. //depot/projects/hammer/usr.sbin/faithd/faithd.8#2 integrate .. //depot/projects/hammer/usr.sbin/faithd/faithd.c#2 integrate .. //depot/projects/hammer/usr.sbin/faithd/faithd.h#2 integrate .. //depot/projects/hammer/usr.sbin/faithd/ftp.c#2 integrate .. //depot/projects/hammer/usr.sbin/faithd/prefix.c#3 integrate .. //depot/projects/hammer/usr.sbin/faithd/rsh.c#2 delete .. //depot/projects/hammer/usr.sbin/faithd/tcp.c#2 integrate .. //depot/projects/hammer/usr.sbin/faithd/test/faithd.rb#2 integrate .. //depot/projects/hammer/usr.sbin/route6d/misc/chkrt#2 integrate .. //depot/projects/hammer/usr.sbin/route6d/route6d.c#6 integrate .. //depot/projects/hammer/usr.sbin/route6d/route6d.h#3 integrate Differences ... ==== //depot/projects/hammer/lib/libc/net/ip6opt.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.6 2003/10/25 06:51:23 ume Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ip6opt.c,v 1.7 2003/11/14 18:07:50 ume Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -113,8 +113,6 @@ return(-1); if (plusy < 0 || plusy > 7) return(-1); - if (typep[0] > 255) - return(-1); /* * If this is the first option, allocate space for the @@ -422,7 +420,7 @@ * The option type must have a value from 2 to 255, inclusive. * (0 and 1 are reserved for the Pad1 and PadN options, respectively.) */ - if (type < 2 || type > 255) + if (type < 2) return(-1); /* ==== //depot/projects/hammer/share/man/man7/build.7#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man7/build.7,v 1.22 2003/11/14 06:24:20 imp Exp $ +.\" $FreeBSD: src/share/man/man7/build.7,v 1.23 2003/11/14 16:55:00 imp Exp $ .\" .Dd March 15, 2002 .Dt BUILD 7 @@ -94,10 +94,6 @@ Install the kernel and the kernel modules. .It Cm reinstallkernel Reinstall the kernel and the kernel modules. -.It Cm most -Build user commands, no libraries or include files. -.It Cm installmost -Install user commands, no libraries or include files. .El .Pp For more information about the ports build process, see @@ -146,7 +142,7 @@ make buildworld make buildkernel KERNCONF=FOO make installkernel KERNCONF=FOO -<Reboot in single user mode> +<Reboot the new kernel in single user mode> make installworld mergemaster .Ed @@ -174,6 +170,11 @@ .Xr top 1 , etc.\&) may not work with the old kernel which is still running. +While not strictly necessary much of the time for upgrades from very +recent sources, the reboot into single user mode is critically +important for upgrading from older kernels, or when you know +.Dq weird things +have happened with the kernel. .Pp The following sequence of commands can be used to cross-build the system for the Alpha architecture on an i386 host: ==== //depot/projects/hammer/sys/dev/bge/if_bge.c#24 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.59 2003/11/13 20:55:47 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.60 2003/11/14 17:16:56 obrien Exp $"); /* * Broadcom BCM570x family gigabit ethernet driver for FreeBSD. @@ -66,9 +66,6 @@ * ring. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.59 2003/11/13 20:55:47 obrien Exp $"); - #include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/dev/ed/if_ed.c#11 (text+ko) ==== @@ -23,10 +23,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/dev/ed/if_ed.c,v 1.222 2003/11/13 20:55:48 obrien Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/ed/if_ed.c,v 1.223 2003/11/14 17:16:56 obrien Exp $"); + /* * Device driver for National Semiconductor DS8390/WD83C690 based ethernet * adapters. By David Greenman, 29-April-1993 ==== //depot/projects/hammer/sys/dev/em/if_em.c#19 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.33 2003/10/31 18:31:59 brooks Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.34 2003/11/14 18:02:24 pdeuskar Exp $*/ #include <dev/em/if_em.h> @@ -51,7 +51,7 @@ * Driver version *********************************************************************/ -char em_driver_version[] = "1.7.16"; +char em_driver_version[] = "1.7.19"; /********************************************************************* @@ -529,6 +529,7 @@ INIT_DEBUGOUT("em_detach: begin"); EM_LOCK(adapter); + adapter->in_detach = 1; em_stop(adapter); em_phy_hw_reset(&adapter->hw); EM_UNLOCK(adapter); @@ -662,6 +663,8 @@ struct ifreq *ifr = (struct ifreq *) data; struct adapter * adapter = ifp->if_softc; + if (adapter->in_detach) return(error); + switch (command) { case SIOCSIFADDR: case SIOCGIFADDR: @@ -686,8 +689,6 @@ EM_LOCK(adapter); if (ifp->if_flags & IFF_UP) { if (!(ifp->if_flags & IFF_RUNNING)) { - bcopy(IF_LLADDR(ifp), adapter->hw.mac_addr, - ETHER_ADDR_LEN); em_init_locked(adapter); } @@ -796,6 +797,10 @@ em_stop(adapter); + /* Get the latest mac address, User can use a LAA */ + bcopy(adapter->interface_data.ac_enaddr, adapter->hw.mac_addr, + ETHER_ADDR_LEN); + /* Initialize the hardware */ if (em_hardware_init(adapter)) { printf("em%d: Unable to initialize the hardware\n", @@ -825,6 +830,9 @@ return; } em_initialize_receive_unit(adapter); + + /* Don't loose promiscuous settings */ + em_set_promisc(adapter); ifp = &adapter->interface_data.ac_if; ifp->if_flags |= IFF_RUNNING; @@ -2601,7 +2609,6 @@ /* Enable Receives */ E1000_WRITE_REG(&adapter->hw, RCTL, reg_rctl); - em_set_promisc(adapter); return; } @@ -2661,7 +2668,7 @@ #endif u_int8_t accept_frame = 0; u_int8_t eop = 0; - u_int16_t len, desc_len; + u_int16_t len, desc_len, prev_len_adj; int i; /* Pointer to the receive descriptor being examined. */ @@ -2687,11 +2694,18 @@ BUS_DMASYNC_POSTREAD); accept_frame = 1; + prev_len_adj = 0; desc_len = le16toh(current_desc->length); if (current_desc->status & E1000_RXD_STAT_EOP) { count--; eop = 1; - len = desc_len - ETHER_CRC_LEN; + if (desc_len < ETHER_CRC_LEN) { + len = 0; + prev_len_adj = ETHER_CRC_LEN - desc_len; + } + else { + len = desc_len - ETHER_CRC_LEN; + } } else { eop = 0; len = desc_len; @@ -2713,7 +2727,7 @@ &adapter->stats, pkt_len, adapter->hw.mac_addr); - len--; + if (len > 0) len--; } else { accept_frame = 0; @@ -2742,6 +2756,14 @@ } else { /* Chain mbuf's together */ mp->m_flags &= ~M_PKTHDR; + /* + * Adjust length of previous mbuf in chain if we + * received less than 4 bytes in the last descriptor. + */ + if (prev_len_adj > 0) { + adapter->lmp->m_len -= prev_len_adj; + adapter->fmp->m_pkthdr.len -= prev_len_adj; + } adapter->lmp->m_next = mp; adapter->lmp = adapter->lmp->m_next; adapter->fmp->m_pkthdr.len += len; ==== //depot/projects/hammer/sys/dev/em/if_em.h#16 (text+ko) ==== @@ -31,7 +31,7 @@ ***************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.23 2003/10/10 23:14:21 sam Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em.h,v 1.24 2003/11/14 18:02:24 pdeuskar Exp $*/ #ifndef _EM_H_DEFINED_ #define _EM_H_DEFINED_ @@ -416,6 +416,7 @@ /* For 82544 PCIX Workaround */ boolean_t pcix_82544; + boolean_t in_detach; #ifdef DBG_STATS unsigned long no_pkts_avail; ==== //depot/projects/hammer/sys/dev/em/if_em_hw.c#10 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/em/if_em_hw.c,v 1.11 2003/08/27 21:52:37 pdeuskar Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/em/if_em_hw.c,v 1.12 2003/11/14 18:02:24 pdeuskar Exp $"); #include <dev/em/if_em_hw.h> @@ -844,18 +844,16 @@ if(i == (LINK_UP_TIMEOUT / 10)) { DEBUGOUT("Never got a valid link from auto-neg!!!\n"); hw->autoneg_failed = 1; - if(hw->media_type == em_media_type_fiber) { - /* AutoNeg failed to achieve a link, so we'll call - * em_check_for_link. This routine will force the link up if - * we detect a signal. This will allow us to communicate with - * non-autonegotiating link partners. - */ - if((ret_val = em_check_for_link(hw))) { - DEBUGOUT("Error while checking for link\n"); - return ret_val; - } - hw->autoneg_failed = 0; + /* AutoNeg failed to achieve a link, so we'll call + * em_check_for_link. This routine will force the link up if + * we detect a signal. This will allow us to communicate with + * non-autonegotiating link partners. + */ + if((ret_val = em_check_for_link(hw))) { + DEBUGOUT("Error while checking for link\n"); + return ret_val; } + hw->autoneg_failed = 0; } else { hw->autoneg_failed = 0; DEBUGOUT("Valid Link Found\n"); @@ -1873,11 +1871,12 @@ * be asked to delay transmission of packets than asking * our link partner to pause transmission of frames. */ - else if(hw->original_fc == em_fc_none || - hw->original_fc == em_fc_tx_pause) { + else if((hw->original_fc == em_fc_none || + hw->original_fc == em_fc_tx_pause) || + hw->fc_strict_ieee) { hw->fc = em_fc_none; DEBUGOUT("Flow Control = NONE.\r\n"); - } else if(!hw->fc_strict_ieee) { + } else { hw->fc = em_fc_rx_pause; DEBUGOUT("Flow Control = RX PAUSE frames only.\r\n"); } @@ -2053,9 +2052,10 @@ * auto-negotiation time to complete, in case the cable was just plugged * in. The autoneg_failed flag does this. */ - else if((hw->media_type == em_media_type_fiber) && + else if((((hw->media_type == em_media_type_fiber) && + ((ctrl & E1000_CTRL_SWDPIN1) == signal)) || + (hw->media_type == em_media_type_internal_serdes)) && (!(status & E1000_STATUS_LU)) && - ((ctrl & E1000_CTRL_SWDPIN1) == signal) && (!(rxcw & E1000_RXCW_C))) { if(hw->autoneg_failed == 0) { hw->autoneg_failed = 1; @@ -2082,7 +2082,8 @@ * Device Control register in an attempt to auto-negotiate with our link * partner. */ - else if((hw->media_type == em_media_type_fiber) && + else if(((hw->media_type == em_media_type_fiber) || + (hw->media_type == em_media_type_internal_serdes)) && (ctrl & E1000_CTRL_SLU) && (rxcw & E1000_RXCW_C)) { DEBUGOUT("RXing /C/, enable AutoNeg and stop forcing link.\r\n"); @@ -4901,77 +4902,6 @@ return E1000_SUCCESS; } -/*************************************************************************** - * - * Workaround for the 82547 long TTL on noisy 100HD hubs. - * - * This function, specific to 82547 hardware only, needs to be called every - * second. It checks if a parallel detect fault has occurred. If a fault - * occurred, disable/enable the DSP reset mechanism up to 5 times (once per - * second). If link is established, stop the workaround and ensure the DSP - * reset is enabled. - * - * hw: Struct containing variables accessed by shared code - * - * returns: - E1000_ERR_PHY if fail to read/write the PHY - * E1000_SUCCESS in any other case - * - ****************************************************************************/ -int32_t -em_igp_ttl_workaround(struct em_hw *hw) -{ - int32_t ret_val; - uint16_t phy_data = 0; - uint16_t dsp_value = DSP_RESET_ENABLE; - - if(((hw->mac_type != em_82541) && (hw->mac_type != em_82547)) || - (!hw->ttl_wa_activation)) { - return E1000_SUCCESS; - } - - /* Check for link first */ - if((ret_val = em_read_phy_reg(hw, PHY_STATUS, &phy_data))) - return ret_val; - - if(phy_data & MII_SR_LINK_STATUS) { - /* If link is established during the workaround, the DSP mechanism must - * be enabled. */ - if(hw->dsp_reset_counter) { - hw->dsp_reset_counter = 0; - dsp_value = DSP_RESET_ENABLE; - } else - return E1000_SUCCESS; - } else { - if(hw->dsp_reset_counter == 0) { - /* Workaround not activated, check if it needs activation */ - if((ret_val = em_read_phy_reg(hw, PHY_AUTONEG_EXP, &phy_data))) - return ret_val; - /* Activate the workaround if there was a parallel detect fault */ - if(phy_data & NWAY_ER_PAR_DETECT_FAULT) - hw->dsp_reset_counter++; - else - return E1000_SUCCESS; - } - - if(hw->dsp_reset_counter) { - /* After 5 times, stop the workaround */ - if(hw->dsp_reset_counter > E1000_MAX_DSP_RESETS) { - hw->dsp_reset_counter = 0; - dsp_value = DSP_RESET_ENABLE; - } else { - dsp_value = (hw->dsp_reset_counter & 1) ? DSP_RESET_DISABLE : - DSP_RESET_ENABLE; - hw->dsp_reset_counter++; - } - } - } - - if((ret_val = em_write_phy_reg(hw, IGP01E1000_PHY_DSP_RESET, dsp_value))) - return ret_val; - - return E1000_SUCCESS; -} - /***************************************************************************** * * This function sets the lplu state according to the active flag. When ==== //depot/projects/hammer/sys/dev/em/if_em_hw.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ *******************************************************************************/ -/*$FreeBSD: src/sys/dev/em/if_em_hw.h,v 1.11 2003/08/27 21:52:37 pdeuskar Exp $*/ +/*$FreeBSD: src/sys/dev/em/if_em_hw.h,v 1.12 2003/11/14 18:02:25 pdeuskar Exp $*/ /* if_em_hw.h * Structures, enums, and macros for the MAC */ @@ -329,7 +329,6 @@ void em_write_reg_io(struct em_hw *hw, uint32_t offset, uint32_t value); int32_t em_config_dsp_after_link_change(struct em_hw *hw, boolean_t link_up); int32_t em_set_d3_lplu_state(struct em_hw *hw, boolean_t active); -int32_t em_igp_ttl_workaround(struct em_hw *hw); #define E1000_READ_REG_IO(a, reg) \ em_read_reg_io((a), E1000_##reg) @@ -1002,7 +1001,6 @@ uint32_t ledctl_mode1; uint32_t ledctl_mode2; uint16_t phy_spd_default; - uint16_t dsp_reset_counter; uint16_t autoneg_advertised; uint16_t pci_cmd_word; uint16_t fc_high_water; @@ -1027,7 +1025,6 @@ uint8_t perm_mac_addr[NODE_ADDRESS_SIZE]; boolean_t disable_polarity_correction; boolean_t speed_downgraded; - boolean_t ttl_wa_activation; em_dsp_config dsp_config_state; boolean_t get_link_status; boolean_t tbi_compatibility_en; @@ -2117,11 +2114,4 @@ #define AUTONEG_ADVERTISE_10_100_ALL 0x000F /* All 10/100 speeds*/ #define AUTONEG_ADVERTISE_10_ALL 0x0003 /* 10Mbps Full & Half speeds*/ -#define TANAX_TTL_WA_RESET(hw) { \ - if((hw)->dsp_reset_counter) { \ - em_write_phy_reg((hw), IGP01E1000_PHY_DSP_RESET, 0x0000); \ - (hw)->dsp_reset_counter = 0; \ - } \ -} - #endif /* _EM_HW_H_ */ ==== //depot/projects/hammer/sys/dev/lge/if_lge.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.25 2003/11/13 20:55:49 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.26 2003/11/14 17:16:56 obrien Exp $"); /* * Level 1 LXT1001 gigabit ethernet driver for FreeBSD. Public @@ -69,9 +69,6 @@ * if in fact he did me much of a favor) */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/lge/if_lge.c,v 1.25 2003/11/13 20:55:49 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> ==== //depot/projects/hammer/sys/dev/lnc/if_lnc.c#9 (text+ko) ==== @@ -26,11 +26,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.99 2003/11/13 20:55:49 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/lnc/if_lnc.c,v 1.100 2003/11/14 17:16:56 obrien Exp $"); /* #define DIAGNOSTIC ==== //depot/projects/hammer/sys/dev/nge/if_nge.c#11 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.50 2003/11/13 20:55:50 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.51 2003/11/14 17:16:56 obrien Exp $"); /* * National Semiconductor DP83820/DP83821 gigabit ethernet driver @@ -88,9 +88,6 @@ * if the user selects an MTU larger than 8152 (8170 - 18). */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/nge/if_nge.c,v 1.50 2003/11/13 20:55:50 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> ==== //depot/projects/hammer/sys/dev/re/if_re.c#6 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.14 2003/11/14 17:16:57 obrien Exp $"); + /* * RealTek 8139C+/8169/8169S/8110S PCI NIC driver * @@ -105,9 +108,6 @@ * driver is 7500 bytes. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.13 2003/11/13 20:55:50 obrien Exp $"); - #include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/dev/sn/if_sn.c#10 (text+ko) ==== @@ -27,11 +27,10 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.33 2003/11/14 05:37:36 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sn/if_sn.c,v 1.34 2003/11/14 17:16:57 obrien Exp $"); /* * This is a driver for SMC's 9000 series of Ethernet adapters. ==== //depot/projects/hammer/sys/dev/tx/if_tx.c#11 (text+ko) ==== @@ -22,11 +22,10 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.78 2003/11/13 20:55:50 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.79 2003/11/14 17:16:57 obrien Exp $"); /* * EtherPower II 10/100 Fast Ethernet (SMC 9432 serie) @@ -40,9 +39,6 @@ * Thanks are going to Steve Bauer and Jason Wright. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/tx/if_tx.c,v 1.78 2003/11/13 20:55:50 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> ==== //depot/projects/hammer/sys/net/pfkeyv2.h#4 (text+ko) ==== @@ -1,5 +1,5 @@ -/* $FreeBSD: src/sys/net/pfkeyv2.h,v 1.11 2003/10/13 14:57:41 ume Exp $ */ -/* $KAME: pfkeyv2.h,v 1.26 2001/06/27 10:49:49 sakane Exp $ */ +/* $FreeBSD: src/sys/net/pfkeyv2.h,v 1.12 2003/11/14 18:17:07 ume Exp $ */ +/* $KAME: pfkeyv2.h,v 1.37 2003/09/06 05:15:43 itojun Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -213,7 +213,7 @@ u_int8_t sadb_x_sa2_mode; u_int8_t sadb_x_sa2_reserved1; u_int16_t sadb_x_sa2_reserved2; - u_int32_t sadb_x_sa2_sequence; + u_int32_t sadb_x_sa2_sequence; /* lowermost 32bit of sequence number */ u_int32_t sadb_x_sa2_reqid; }; @@ -240,9 +240,7 @@ * This structure is aligned 8 bytes. */ struct sadb_x_ipsecrequest { - u_int16_t sadb_x_ipsecrequest_len; /* structure length aligned to 8 bytes. - * This value is true length of bytes. - * Not in units of 64 bits. */ + u_int16_t sadb_x_ipsecrequest_len; /* structure length in 64 bits. */ u_int16_t sadb_x_ipsecrequest_proto; /* See ipsec.h */ u_int8_t sadb_x_ipsecrequest_mode; /* See IPSEC_MODE_XX in ipsec.h. */ u_int8_t sadb_x_ipsecrequest_level; /* See IPSEC_LEVEL_XX in ipsec.h */ ==== //depot/projects/hammer/sys/pci/if_dc.c#25 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.134 2003/11/14 17:16:57 obrien Exp $"); + /* * DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143 * series chips and several workalikes including the following: @@ -60,7 +63,6 @@ * Electrical Engineering Department * Columbia University, New York City */ - /* * The Intel 21143 is the successor to the DEC 21140. It is basically * the same as the 21140 but with a few new features. The 21143 supports @@ -89,9 +91,6 @@ * AX88140A doesn't support internal NWAY. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_dc.c,v 1.133 2003/11/14 05:45:39 imp Exp $"); - #include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/pci/if_pcn.c#12 (text+ko) ==== @@ -31,6 +31,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_pcn.c,v 1.51 2003/11/14 17:16:57 obrien Exp $"); + /* * AMD Am79c972 fast ethernet PCI NIC driver. Datatheets are available * from http://www.amd.com. @@ -49,9 +52,6 @@ * layers without copying on both the x86 and alpha platforms). */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_pcn.c,v 1.50 2003/11/13 20:55:52 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> ==== //depot/projects/hammer/sys/pci/if_rl.c#21 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.124 2003/11/14 17:16:57 obrien Exp $"); + /* * RealTek 8129/8139 PCI NIC driver * @@ -41,7 +44,6 @@ * Electrical Engineering Department * Columbia University, New York City */ - /* * The RealTek 8139 PCI NIC redefines the meaning of 'low end.' This is * probably the worst PCI ethernet controller ever made, with the possible @@ -81,9 +83,6 @@ * to select which interface to use depending on the chip type. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_rl.c,v 1.123 2003/11/13 20:55:52 obrien Exp $"); - #include <sys/param.h> #include <sys/endian.h> #include <sys/systm.h> ==== //depot/projects/hammer/sys/pci/if_sf.c#13 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_sf.c,v 1.62 2003/11/14 17:16:57 obrien Exp $"); + /* * Adaptec AIC-6915 "Starfire" PCI fast ethernet driver for FreeBSD. * Programming manual is available from: @@ -39,7 +42,6 @@ * Department of Electical Engineering * Columbia University, New York City */ - /* * The Adaptec AIC-6915 "Starfire" is a 64-bit 10/100 PCI ethernet * controller designed with flexibility and reducing CPU load in mind. @@ -77,9 +79,6 @@ * registers inside the 256-byte I/O window. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_sf.c,v 1.61 2003/11/13 20:55:52 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> ==== //depot/projects/hammer/sys/pci/if_sis.c#17 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.89 2003/11/14 17:16:57 obrien Exp $"); + /* * SiS 900/SiS 7016 fast ethernet PCI NIC driver. Datasheets are * available from http://www.sis.com.tw. @@ -41,7 +44,6 @@ * Electrical Engineering Department * Columbia University, New York City */ - /* * The SiS 900 is a fairly simple chip. It uses bus master DMA with * simple TX and RX descriptors of 3 longwords in size. The receiver @@ -55,9 +57,6 @@ * longword aligned. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_sis.c,v 1.88 2003/11/13 20:55:52 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> ==== //depot/projects/hammer/sys/pci/if_sk.c#15 (text+ko) ==== @@ -31,7 +31,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 2003 Nathan L. Binkert <binkertn@umich.edu> * @@ -48,6 +47,9 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_sk.c,v 1.70 2003/11/14 17:16:58 obrien Exp $"); + /* * SysKonnect SK-NET gigabit ethernet driver for FreeBSD. Supports * the SK-984x series adapters, both single port and dual port. @@ -66,7 +68,6 @@ * Department of Electrical Engineering * Columbia University, New York City */ - /* * The SysKonnect gigabit ethernet adapters consist of two main * components: the SysKonnect GEnesis controller chip and the XaQti Corp. @@ -84,9 +85,6 @@ * both XMACs to operate as independent interfaces. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_sk.c,v 1.69 2003/11/13 20:55:53 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> @@ -137,7 +135,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/sys/pci/if_sk.c,v 1.69 2003/11/13 20:55:53 obrien Exp $"; + "$FreeBSD: src/sys/pci/if_sk.c,v 1.70 2003/11/14 17:16:58 obrien Exp $"; #endif static struct sk_type sk_devs[] = { ==== //depot/projects/hammer/sys/pci/if_tl.c#11 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_tl.c,v 1.87 2003/11/14 17:16:58 obrien Exp $"); + /* * Texas Instruments ThunderLAN driver for FreeBSD 2.2.6 and 3.x. * Supports many Compaq PCI NICs based on the ThunderLAN ethernet controller, @@ -47,7 +50,6 @@ * Electrical Engineering Department * Columbia University, New York City */ - /* * Some notes about the ThunderLAN: * @@ -118,7 +120,6 @@ * TX 'end of frame' interrupt. It will also generate an 'end of channel' * interrupt when it reaches the end of the list. */ - /* * Some notes about this driver: * @@ -176,9 +177,6 @@ * itself thereby reducing the load on the host CPU. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_tl.c,v 1.86 2003/11/13 20:55:53 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> ==== //depot/projects/hammer/sys/pci/if_vr.c#12 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.76 2003/11/14 17:16:58 obrien Exp $"); + /* * VIA Rhine fast ethernet PCI NIC driver * @@ -41,7 +44,6 @@ * Electrical Engineering Department * Columbia University, New York City */ - /* * The VIA Rhine controllers are similar in some respects to the * the DEC tulip chips, except less complicated. The controller @@ -57,9 +59,6 @@ * transmission. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_vr.c,v 1.75 2003/11/13 20:55:53 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> ==== //depot/projects/hammer/sys/pci/if_wb.c#12 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_wb.c,v 1.65 2003/11/14 17:16:58 obrien Exp $"); + /* * Winbond fast ethernet PCI NIC driver * @@ -41,7 +44,6 @@ * Electrical Engineering Department * Columbia University, New York City */ - /* * The Winbond W89C840F chip is a bus master; in some ways it resembles * a DEC 'tulip' chip, only not as complicated. Unfortunately, it has @@ -81,9 +83,6 @@ * three of my test boards seems fine. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_wb.c,v 1.64 2003/11/13 20:55:53 obrien Exp $"); - #include "opt_bdg.h" #include <sys/param.h> ==== //depot/projects/hammer/sys/pci/if_xl.c#26 (text+ko) ==== @@ -30,6 +30,9 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.160 2003/11/14 17:16:58 obrien Exp $"); + /* * 3Com 3c90x Etherlink XL PCI NIC driver * @@ -71,7 +74,6 @@ * Electrical Engineering Department * Columbia University, New York City */ - /* * The 3c90x series chips use a bus-master DMA interface for transfering * packets to and from the controller chip. Some of the "vortex" cards @@ -99,9 +101,6 @@ * PCI-based NICs. */ -#include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.159 2003/11/13 20:55:53 obrien Exp $"); - #include <sys/param.h> #include <sys/systm.h> #include <sys/sockio.h> ==== //depot/projects/hammer/sys/vm/uma_core.c#17 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311141843.hAEIhCPo057203>