cvs commit: src/sys/compat/linux linux_ioctl.c src/sys/compat/svr4 svr4_sockio.c src/sys/contrib/altq/altq altq_cbq.c src/sys/contrib/dev/oltr if_oltr.c src/sys/contrib/pf/net if_pflog.c if_pfsync.c src/sys/dev/an if_an.c src/sys/dev/ar ...

Robert Watson rwatson at FreeBSD.org
Thu Aug 25 05:01:25 GMT 2005


rwatson     2005-08-25 05:01:24 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/compat/linux     linux_ioctl.c 
    sys/compat/svr4      svr4_sockio.c 
    sys/contrib/altq/altq altq_cbq.c 
    sys/contrib/dev/oltr if_oltr.c 
    sys/contrib/pf/net   if_pflog.c if_pfsync.c 
    sys/dev/an           if_an.c 
    sys/dev/ar           if_ar.c 
    sys/dev/arl          if_arl.c 
    sys/dev/ath          if_ath.c 
    sys/dev/ath/ath_rate/amrr amrr.c 
    sys/dev/ath/ath_rate/onoe onoe.c 
    sys/dev/awi          awi.c 
    sys/dev/bfe          if_bfe.c 
    sys/dev/bge          if_bge.c 
    sys/dev/cm           if_cm_isa.c smc90cx6.c 
    sys/dev/cnw          if_cnw.c 
    sys/dev/cp           if_cp.c 
    sys/dev/cs           if_cs.c 
    sys/dev/ctau         if_ct.c 
    sys/dev/cx           if_cx.c 
    sys/dev/ed           if_ed.c 
    sys/dev/em           if_em.c 
    sys/dev/en           if_en_pci.c midway.c 
    sys/dev/ep           if_ep.c 
    sys/dev/ex           if_ex.c 
    sys/dev/fatm         if_fatm.c 
    sys/dev/fe           if_fe.c 
    sys/dev/firewire     if_fwe.c if_fwip.c 
    sys/dev/fxp          if_fxp.c 
    sys/dev/gem          if_gem.c 
    sys/dev/hatm         if_hatm.c if_hatm_intr.c if_hatm_ioctl.c 
                         if_hatm_rx.c if_hatm_tx.c 
    sys/dev/hme          if_hme.c 
    sys/dev/ie           if_ie.c 
    sys/dev/if_ndis      if_ndis.c 
    sys/dev/iicbus       if_ic.c 
    sys/dev/ipw          if_ipw.c 
    sys/dev/iwi          if_iwi.c 
    sys/dev/ixgb         if_ixgb.c 
    sys/dev/lge          if_lge.c 
    sys/dev/lnc          if_lnc.c 
    sys/dev/my           if_my.c 
    sys/dev/nge          if_nge.c 
    sys/dev/nve          if_nve.c 
    sys/dev/owi          if_owi.c 
    sys/dev/patm         if_patm.c if_patm_intr.c if_patm_ioctl.c 
                         if_patm_tx.c 
    sys/dev/pdq          pdq_ifsubr.c 
    sys/dev/ppbus        if_plip.c 
    sys/dev/ral          if_ral.c if_ral_pci.c 
    sys/dev/ray          if_ray.c if_rayvar.h 
    sys/dev/re           if_re.c 
    sys/dev/sbni         if_sbni.c 
    sys/dev/sbsh         if_sbsh.c 
    sys/dev/sn           if_sn.c 
    sys/dev/snc          dp83932.c if_snc_pccard.c 
    sys/dev/sr           if_sr.c 
    sys/dev/tx           if_tx.c 
    sys/dev/txp          if_txp.c 
    sys/dev/usb          if_aue.c if_axe.c if_cdce.c if_cue.c 
                         if_kue.c if_rue.c if_udav.c if_ural.c 
    sys/dev/vge          if_vge.c 
    sys/dev/vx           if_vx.c 
    sys/dev/wi           if_wi.c if_wi_pci.c 
    sys/dev/wl           if_wl.c 
    sys/dev/xe           if_xe.c if_xe_pccard.c 
    sys/i386/isa         if_el.c 
    sys/i4b/driver       i4b_ipr.c i4b_isppp.c 
    sys/kern             kern_poll.c 
    sys/net              bridge.c bridgestp.c if_arcsubr.c 
                         if_atm.h if_atmsubr.c if_bridge.c if_ef.c 
                         if_ethersubr.c if_faith.c if_fddisubr.c 
                         if_fwsubr.c if_gif.c if_gre.c 
                         if_iso88025subr.c if_loop.c if_ppp.c 
                         if_spppsubr.c if_tap.c if_tun.c if_vlan.c 
                         ppp_tty.c 
    sys/net80211         ieee80211_ioctl.c 
    sys/netatm           atm_if.c 
    sys/netgraph         ng_eiface.c ng_ether.c ng_fec.c 
                         ng_iface.c ng_sppp.c 
    sys/netinet          ip_carp.c ip_fastfwd.c 
    sys/netinet6         in6.c nd6_nbr.c 
    sys/netnatm          natm.c 
    sys/pci              if_dc.c if_de.c if_pcn.c if_rl.c if_sf.c 
                         if_sis.c if_sk.c if_ste.c if_ti.c if_tl.c 
                         if_vr.c if_wb.c if_xl.c 
  Log:
  Merge linux_ioctl.c:1.128 svr4_sockio.c:1.17 altq_cbq.c:1.3 if_oltr.c:1.38
  if_pflog.c:1.14 if_pfsync.c:1.21 if_an.c:1.70 if_ar.c:1.72 if_arl.c:1.11
  amrr.c:1.10 onoe.c:1.10 if_ath.c:1.101 awi.c:1.41 if_bfe.c:1.27
  if_bge.c:1.93 if_cm_isa.c:1.7 smc90cx6.c:1.16 if_cnw.c:1.20 if_cp.c:1.25
  if_cs.c:1.42 if_ct.c:1.26 if_cx.c:1.46 if_ed.c:1.256 if_em.c:1.68
  if_en_pci.c:1.37 midway.c:1.66 if_ep.c:1.143 if_ex.c:1.58 if_fatm.c:1.20
  if_fe.c:1.93 if_fwe.c:1.38 if_fwip.c:1.8 if_fxp.c:1.244 if_gem.c:1.33
  if_hatm.c:1.25 if_hatm_intr.c:1.20 if_hatm_ioctl.c:1.13 if_hatm_rx.c:1.10
  if_hatm_tx.c:1.14 if_hme.c:1.39 if_ie.c:1.104 if_ndis.c:1.101
  if_ic.c:1.24 if_ipw.c:1.10 if_iwi.c:1.10 if_ixgb.c:1.13 if_lge.c:1.41
  if_lnc.c:1.113 if_my.c:1.31 if_nge.c:1.77 if_nve.c:1.10 if_owi.c:1.12
  if_patm.c:1.9 if_patm_intr.c:1.6 if_patm_ioctl.c:1.10 if_patm_tx.c:1.10
  pdq_ifsubr.c:1.28 if_plip.c:1.38 if_ral.c:1.12 if_ral_pci.c:1.2
  if_ray.c:1.81 if_rayvar.h:1.22 if_re.c:1.49 if_sbni.c:1.21 if_sbsh.c:1.14
  if_sn.c:1.48 dp83932.c:1.21 if_snc_pccard.c:1.9 if_sr.c:1.70 if_tx.c:1.91
  if_txp.c:1.33 if_aue.c:1.92 if_axe.c:1.32 if_cdce.c:1.8 if_cue.c:1.59
  if_kue.c:1.66 if_rue.c:1.23 if_udav.c:1.16 if_ural.c:1.12 if_vge.c:1.16
  if_vx.c:1.58 if_wi.c:1.185 if_wi_pci.c:1.26 if_wl.c:1.68 if_xe.c:1.60
  if_xe_pccard.c:1.30 if_el.c:1.68 i4b_ipr.c:1.35 i4b_isppp.c:1.31
  kern_poll.c:1.20 bridge.c:1.94 bridgestp.c:1.4 if_arcsubr.c:1.27
  if_atm.h:1.24 if_atmsubr.c:1.40 if_bridge.c:1.16 if_ef.c:1.35
  if_ethersubr.c:1.196 if_faith.c:1.37 if_fddisubr.c:1.100 if_fwsubr.c:1.14
  if_gif.c:1.54 if_gre.c:1.34 if_iso88025subr.c:1.70 if_loop.c:1.107
  if_ppp.c:1.106 if_spppsubr.c:1.121 if_tap.c:1.57 if_tun.c:1.154
  if_vlan.c:1.80 ppp_tty.c:1.67 ieee80211_ioctl.c:1.32 atm_if.c:1.31
  ng_eiface.c:1.33 ng_ether.c:1.50 ng_fec.c:1.19 ng_iface.c:1.44
  ng_sppp.c:1.9 ip_carp.c:1.30 ip_fastfwd.c:1.30 in6.c:1.53 nd6_nbr.c:1.31
  natm.c:1.40 if_dc.c:1.162 if_de.c:1.168 if_pcn.c:1.72 if_rl.c:1.154
  if_sf.c:1.84 if_sis.c:1.135 if_sk.c:1.108 if_ste.c:1.86 if_ti.c:1.109
  if_tl.c:1.101 if_vr.c:1.106 if_wb.c:1.81 if_xl.c:1.194 from HEAD to
  RELENG_6:
  
    Propagate rename of IFF_OACTIVE and IFF_RUNNING to IFF_DRV_OACTIVE and
    IFF_DRV_RUNNING, as well as the move from ifnet.if_flags to
    ifnet.if_drv_flags.  Device drivers are now responsible for
    synchronizing access to these flags, as they are in if_drv_flags.  This
    helps prevent races between the network stack and device driver in
    maintaining the interface flags field.
  
    Many __FreeBSD__ and __FreeBSD_version checks maintained and continued;
    some less so.
  
    Reviewed by:    pjd, bz
  
  Approved by:    re (scottl)
  
  Revision   Changes    Path
  1.127.2.1  +2 -2      src/sys/compat/linux/linux_ioctl.c
  1.16.2.1   +2 -1      src/sys/compat/svr4/svr4_sockio.c
  1.2.8.1    +2 -2      src/sys/contrib/altq/altq/altq_cbq.c
  1.37.2.1   +11 -10    src/sys/contrib/dev/oltr/if_oltr.c
  1.13.2.1   +3 -3      src/sys/contrib/pf/net/if_pflog.c
  1.19.2.2   +3 -3      src/sys/contrib/pf/net/if_pfsync.c
  1.67.2.2   +12 -12    src/sys/dev/an/if_an.c
  1.71.2.1   +14 -14    src/sys/dev/ar/if_ar.c
  1.10.2.1   +10 -10    src/sys/dev/arl/if_arl.c
  1.8.2.2    +1 -1      src/sys/dev/ath/ath_rate/amrr/amrr.c
  1.8.2.2    +1 -1      src/sys/dev/ath/ath_rate/onoe/onoe.c
  1.94.2.3   +16 -15    src/sys/dev/ath/if_ath.c
  1.37.2.3   +6 -6      src/sys/dev/awi/awi.c
  1.25.2.2   +14 -13    src/sys/dev/bfe/if_bfe.c
  1.91.2.2   +16 -15    src/sys/dev/bge/if_bge.c
  1.6.2.1    +1 -1      src/sys/dev/cm/if_cm_isa.c
  1.15.2.1   +12 -12    src/sys/dev/cm/smc90cx6.c
  1.18.2.2   +26 -8     src/sys/dev/cnw/if_cnw.c
  1.24.2.1   +6 -6      src/sys/dev/cp/if_cp.c
  1.41.2.1   +12 -12    src/sys/dev/cs/if_cs.c
  1.25.2.1   +6 -6      src/sys/dev/ctau/if_ct.c
  1.45.2.1   +6 -6      src/sys/dev/cx/if_cx.c
  1.254.2.2  +12 -12    src/sys/dev/ed/if_ed.c
  1.65.2.2   +19 -17    src/sys/dev/em/if_em.c
  1.36.2.1   +2 -2      src/sys/dev/en/if_en_pci.c
  1.65.2.1   +10 -10    src/sys/dev/en/midway.c
  1.140.2.1  +10 -10    src/sys/dev/ep/if_ep.c
  1.56.2.2   +9 -9      src/sys/dev/ex/if_ex.c
  1.19.2.1   +16 -16    src/sys/dev/fatm/if_fatm.c
  1.91.2.2   +13 -14    src/sys/dev/fe/if_fe.c
  1.37.2.1   +25 -0     src/sys/dev/firewire/if_fwe.c
  1.7.2.2    +25 -0     src/sys/dev/firewire/if_fwip.c
  1.240.2.3  +4 -4      src/sys/dev/fxp/if_fxp.c
  1.29.2.2   +8 -7      src/sys/dev/gem/if_gem.c
  1.24.2.1   +5 -5      src/sys/dev/hatm/if_hatm.c
  1.18.2.2   +1 -1      src/sys/dev/hatm/if_hatm_intr.c
  1.12.2.1   +7 -7      src/sys/dev/hatm/if_hatm_ioctl.c
  1.9.2.1    +2 -2      src/sys/dev/hatm/if_hatm_rx.c
  1.13.2.1   +1 -1      src/sys/dev/hatm/if_hatm_tx.c
  1.37.2.2   +10 -9     src/sys/dev/hme/if_hme.c
  1.102.2.2  +10 -10    src/sys/dev/ie/if_ie.c
  1.99.2.2   +9 -9      src/sys/dev/if_ndis/if_ndis.c
  1.23.2.1   +7 -5      src/sys/dev/iicbus/if_ic.c
  1.7.2.2    +11 -11    src/sys/dev/ipw/if_ipw.c
  1.8.2.2    +11 -11    src/sys/dev/iwi/if_iwi.c
  1.10.2.3   +18 -17    src/sys/dev/ixgb/if_ixgb.c
  1.39.2.2   +13 -13    src/sys/dev/lge/if_lge.c
  1.111.2.2  +14 -14    src/sys/dev/lnc/if_lnc.c
  1.29.2.2   +6 -6      src/sys/dev/my/if_my.c
  1.75.2.2   +13 -13    src/sys/dev/nge/if_nge.c
  1.7.2.2    +12 -12    src/sys/dev/nve/if_nve.c
  1.9.2.3    +10 -10    src/sys/dev/owi/if_owi.c
  1.8.2.1    +3 -3      src/sys/dev/patm/if_patm.c
  1.5.2.1    +1 -1      src/sys/dev/patm/if_patm_intr.c
  1.9.2.1    +7 -7      src/sys/dev/patm/if_patm_ioctl.c
  1.9.2.1    +1 -1      src/sys/dev/patm/if_patm_tx.c
  1.26.2.2   +8 -8      src/sys/dev/pdq/pdq_ifsubr.c
  1.37.2.1   +8 -6      src/sys/dev/ppbus/if_plip.c
  1.10.2.2   +13 -12    src/sys/dev/ral/if_ral.c
  1.1.2.1    +1 -1      src/sys/dev/ral/if_ral_pci.c
  1.79.2.2   +20 -20    src/sys/dev/ray/if_ray.c
  1.21.2.1   +3 -3      src/sys/dev/ray/if_rayvar.h
  1.46.2.3   +7 -7      src/sys/dev/re/if_re.c
  1.20.2.1   +9 -9      src/sys/dev/sbni/if_sbni.c
  1.12.2.2   +8 -8      src/sys/dev/sbsh/if_sbsh.c
  1.45.2.2   +14 -13    src/sys/dev/sn/if_sn.c
  1.19.2.2   +12 -10    src/sys/dev/snc/dp83932.c
  1.8.2.1    +1 -1      src/sys/dev/snc/if_snc_pccard.c
  1.69.2.1   +11 -11    src/sys/dev/sr/if_sr.c
  1.89.2.2   +9 -9      src/sys/dev/tx/if_tx.c
  1.31.2.2   +10 -9     src/sys/dev/txp/if_txp.c
  1.90.2.2   +14 -14    src/sys/dev/usb/if_aue.c
  1.30.2.2   +13 -13    src/sys/dev/usb/if_axe.c
  1.7.2.1    +15 -15    src/sys/dev/usb/if_cdce.c
  1.57.2.2   +13 -13    src/sys/dev/usb/if_cue.c
  1.64.2.2   +13 -13    src/sys/dev/usb/if_kue.c
  1.21.2.2   +14 -14    src/sys/dev/usb/if_rue.c
  1.14.2.2   +36 -5     src/sys/dev/usb/if_udav.c
  1.10.2.2   +12 -11    src/sys/dev/usb/if_ural.c
  1.14.2.2   +10 -10    src/sys/dev/vge/if_vge.c
  1.56.2.1   +11 -11    src/sys/dev/vx/if_vx.c
  1.180.2.3  +10 -10    src/sys/dev/wi/if_wi.c
  1.25.2.1   +1 -1      src/sys/dev/wi/if_wi_pci.c
  1.66.2.2   +7 -7      src/sys/dev/wl/if_wl.c
  1.55.2.2   +15 -15    src/sys/dev/xe/if_xe.c
  1.26.2.1   +1 -1      src/sys/dev/xe/if_xe_pccard.c
  1.67.2.1   +8 -8      src/sys/i386/isa/if_el.c
  1.34.2.1   +5 -4      src/sys/i4b/driver/i4b_ipr.c
  1.30.2.1   +1 -1      src/sys/i4b/driver/i4b_isppp.c
  1.19.2.1   +8 -6      src/sys/kern/kern_poll.c
  1.93.2.1   +2 -1      src/sys/net/bridge.c
  1.3.2.2    +3 -3      src/sys/net/bridgestp.c
  1.25.2.2   +2 -1      src/sys/net/if_arcsubr.c
  1.23.2.1   +2 -2      src/sys/net/if_atm.h
  1.37.2.3   +2 -1      src/sys/net/if_atmsubr.c
  1.11.2.6   +27 -25    src/sys/net/if_bridge.c
  1.34.2.1   +3 -3      src/sys/net/if_ef.c
  1.193.2.2  +2 -1      src/sys/net/if_ethersubr.c
  1.36.2.1   +2 -1      src/sys/net/if_faith.c
  1.98.2.2   +4 -2      src/sys/net/if_fddisubr.c
  1.12.2.2   +2 -1      src/sys/net/if_fwsubr.c
  1.52.2.1   +6 -6      src/sys/net/if_gif.c
  1.32.2.2   +4 -3      src/sys/net/if_gre.c
  1.67.2.3   +4 -2      src/sys/net/if_iso88025subr.c
  1.106.2.1  +2 -1      src/sys/net/if_loop.c
  1.105.2.2  +4 -3      src/sys/net/if_ppp.c
  1.119.2.1  +18 -16    src/sys/net/if_spppsubr.c
  1.55.2.2   +8 -8      src/sys/net/if_tap.c
  1.152.2.2  +4 -3      src/sys/net/if_tun.c
  1.79.2.2   +7 -7      src/sys/net/if_vlan.c
  1.66.2.2   +1 -1      src/sys/net/ppp_tty.c
  1.25.2.2   +2 -1      src/sys/net80211/ieee80211_ioctl.c
  1.30.2.1   +4 -2      src/sys/netatm/atm_if.c
  1.32.2.1   +17 -14    src/sys/netgraph/ng_eiface.c
  1.49.2.1   +2 -1      src/sys/netgraph/ng_ether.c
  1.18.2.1   +9 -7      src/sys/netgraph/ng_fec.c
  1.43.2.1   +13 -10    src/sys/netgraph/ng_iface.c
  1.8.2.1    +6 -5      src/sys/netgraph/ng_sppp.c
  1.27.2.1   +28 -23    src/sys/netinet/ip_carp.c
  1.28.2.1   +1 -1      src/sys/netinet/ip_fastfwd.c
  1.51.2.1   +2 -2      src/sys/netinet6/in6.c
  1.29.2.1   +1 -1      src/sys/netinet6/nd6_nbr.c
  1.37.2.3   +1 -1      src/sys/netnatm/natm.c
  1.160.2.2  +13 -12    src/sys/pci/if_dc.c
  1.162.2.4  +16 -15    src/sys/pci/if_de.c
  1.69.2.2   +10 -10    src/sys/pci/if_pcn.c
  1.152.2.2  +6 -6      src/sys/pci/if_rl.c
  1.82.2.2   +11 -11    src/sys/pci/if_sf.c
  1.132.2.3  +7 -7      src/sys/pci/if_sis.c
  1.106.2.2  +16 -14    src/sys/pci/if_sk.c
  1.84.2.2   +11 -11    src/sys/pci/if_ste.c
  1.107.2.2  +14 -13    src/sys/pci/if_ti.c
  1.99.2.2   +8 -8      src/sys/pci/if_tl.c
  1.104.2.2  +7 -7      src/sys/pci/if_vr.c
  1.79.2.2   +6 -6      src/sys/pci/if_wb.c
  1.190.2.2  +12 -12    src/sys/pci/if_xl.c


More information about the cvs-src mailing list