Diff for /elwix/config/Attic/ELWIX between versions 1.3.2.11 and 1.3.2.12

version 1.3.2.11, 2012/05/30 07:07:44 version 1.3.2.12, 2012/10/09 08:47:50
Line 16 Line 16
 # If you are in doubt as to the purpose or necessity of a line, check first  # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.  # in NOTES.
 #  #
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.571 2012/05/10 12:37:32 mav Exp $# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.578 2012/09/13 10:12:16 kib Exp $
   
 cpu             I486_CPU  cpu             I486_CPU
 cpu             I586_CPU  cpu             I586_CPU
Line 32  options  SCHED_ULE  # ULE scheduler Line 32  options  SCHED_ULE  # ULE scheduler
 options         PREEMPTION              # Enable kernel thread preemption  options         PREEMPTION              # Enable kernel thread preemption
 options         INET                    # InterNETworking  options         INET                    # InterNETworking
 options         INET6                   # IPv6 communications protocols  options         INET6                   # IPv6 communications protocols
   options         TCP_OFFLOAD             # TCP offload
 options         SCTP                    # Stream Control Transmission Protocol  options         SCTP                    # Stream Control Transmission Protocol
 options         FFS                     # Berkeley Fast Filesystem  options         FFS                     # Berkeley Fast Filesystem
 options         SOFTUPDATES             # Enable FFS soft updates support  options         SOFTUPDATES             # Enable FFS soft updates support
Line 51  options  CD9660   # ISO 9660 Filesystem Line 52  options  CD9660   # ISO 9660 Filesystem
 options         PROCFS                  # Process filesystem (requires PSEUDOFS)  options         PROCFS                  # Process filesystem (requires PSEUDOFS)
 options         PSEUDOFS                # Pseudo-filesystem framework  options         PSEUDOFS                # Pseudo-filesystem framework
 options         GEOM_PART_GPT           # GUID Partition Tables.  options         GEOM_PART_GPT           # GUID Partition Tables.
   options         GEOM_RAID               # Soft RAID functionality.
 options         GEOM_LABEL              # Provides labelization  options         GEOM_LABEL              # Provides labelization
 options         GEOM_UZIP  options         GEOM_UZIP
 options         GEOM_ELI  options         GEOM_ELI
Line 82  options  AUDIT   # Security event auditing Line 84  options  AUDIT   # Security event auditing
 options         CAPABILITY_MODE         # Capsicum capability mode  options         CAPABILITY_MODE         # Capsicum capability mode
 options         CAPABILITIES            # Capsicum capabilities  options         CAPABILITIES            # Capsicum capabilities
 options         MAC                     # TrustedBSD MAC Framework  options         MAC                     # TrustedBSD MAC Framework
 options         FLOWTABLE               # per-cpu routing cache  
 #options        KDTRACE_HOOKS           # Kernel DTrace hooks  #options        KDTRACE_HOOKS           # Kernel DTrace hooks
 #options        DDB_CTF                 # Kernel ELF linker loads CTF data  #options        DDB_CTF                 # Kernel ELF linker loads CTF data
   options         FLOWTABLE               # per-cpu routing cache
 options         INCLUDE_CONFIG_FILE     # Include this file in kernel  options         INCLUDE_CONFIG_FILE     # Include this file in kernel
   
 # Debugging support.  Always need this:  # Debugging support.  Always need this:
Line 170  device  ciss  # Compaq Smart RAID 5* Line 172  device  ciss  # Compaq Smart RAID 5*
 device          dpt             # DPT Smartcache III, IV - See NOTES for options  device          dpt             # DPT Smartcache III, IV - See NOTES for options
 device          hptmv           # Highpoint RocketRAID 182x  device          hptmv           # Highpoint RocketRAID 182x
 device          hptrr           # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx  device          hptrr           # Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
   device          hpt27xx         # Highpoint RocketRAID 27xx
 device          iir             # Intel Integrated RAID  device          iir             # Intel Integrated RAID
 device          ips             # IBM (Adaptec) ServeRAID  device          ips             # IBM (Adaptec) ServeRAID
 device          mly             # Mylex AcceleRAID/eXtremeRAID  device          mly             # Mylex AcceleRAID/eXtremeRAID
Line 300  options  XBONEHACK Line 303  options  XBONEHACK
 options         WLCACHE  options         WLCACHE
 device          wlan_acl  device          wlan_acl
 device          wlan_xauth  device          wlan_xauth
 options         ATH_ENABLE_11N  
 options         IEEE80211_SUPPORT_TDMA  options         IEEE80211_SUPPORT_TDMA
 options         IEEE80211_SUPPORT_SUPERG  options         IEEE80211_SUPPORT_SUPERG
 # Wireless NIC cards  # Wireless NIC cards
Line 313  device  wlan_ccmp # 802.11 CCMP support Line 315  device  wlan_ccmp # 802.11 CCMP support
 device          wlan_tkip       # 802.11 TKIP support  device          wlan_tkip       # 802.11 TKIP support
 device          wlan_amrr       # AMRR transmit rate control algorithm  device          wlan_amrr       # AMRR transmit rate control algorithm
 device          an              # Aironet 4500/4800 802.11 wireless NICs.  device          an              # Aironet 4500/4800 802.11 wireless NICs.
device          ath             # Atheros NIC'sdevice          ath             # Atheros NICs
 device          ath_pci         # Atheros pci/cardbus glue  device          ath_pci         # Atheros pci/cardbus glue
 device          ath_hal         # pci/cardbus chip support  device          ath_hal         # pci/cardbus chip support
 options         AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors  options         AH_SUPPORT_AR5416       # enable AR5416 tx/rx descriptors
   options         AH_AR5416_INTERRUPT_MITIGATION  # AR5416 interrupt mitigation
   options         ATH_ENABLE_11N  # Enable 802.11n support for AR5416 and later
 device          ath_rate_sample # SampleRate tx rate control for ath  device          ath_rate_sample # SampleRate tx rate control for ath
 device          bwi             # Broadcom BCM430x/BCM431x wireless NICs.  device          bwi             # Broadcom BCM430x/BCM431x wireless NICs.
 device          bwn             # Broadcom BCM43xx wireless NICs.  device          bwn             # Broadcom BCM43xx wireless NICs.
Line 339  device  wpifw Line 343  device  wpifw
 # Pseudo devices.  # Pseudo devices.
 device          loop            # Network loopback  device          loop            # Network loopback
 device          random          # Entropy device  device          random          # Entropy device
   options         PADLOCK_RNG     # VIA Padlock RNG
   options         RDRAND_RNG      # Intel Bull Mountain RNG
 device          ether           # Ethernet support  device          ether           # Ethernet support
 device          vlan            # 802.1Q VLAN support  device          vlan            # 802.1Q VLAN support
 device          tun             # Packet tunnel.  device          tun             # Packet tunnel.
Line 558  device  wbwd Line 564  device  wbwd
   
 #device         disc  #device         disc
 #device         edsc  #device         edsc
#options         VIMAGEoptions         VIMAGE
 device          epair  device          epair
 device          stf  device          stf
   
 # NETMAP subsystem  # NETMAP subsystem
###device          netmapdevice          netmap
   
 device          rlswitch  device          rlswitch
   

Removed from v.1.3.2.11  
changed lines
  Added in v.1.3.2.12


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>