Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

sync with -current

  • Loading branch information...
commit 824025745da6fd51af239bfe633e5191c7d226d3 1 parent 8acf1bd
kent authored
Showing with 8,592 additions and 5,248 deletions.
  1. +9 −9 sys/altq/altq_afmap.c
  2. +13 −13 sys/altq/altq_blue.c
  3. +2 −2 sys/altq/altq_blue.h
  4. +7 −7 sys/altq/altq_cbq.c
  5. +8 −8 sys/altq/altq_cbq.h
  6. +17 −17 sys/altq/altq_cdnr.c
  7. +3 −3 sys/altq/altq_cdnr.h
  8. +9 −9 sys/altq/altq_classq.h
  9. +7 −7 sys/altq/altq_conf.c
  10. +4 −4 sys/altq/altq_fifoq.c
  11. +2 −2 sys/altq/altq_fifoq.h
  12. +49 −49 sys/altq/altq_hfsc.c
  13. +4 −4 sys/altq/altq_hfsc.h
  14. +3 −3 sys/altq/altq_localq.c
  15. +13 −13 sys/altq/altq_priq.c
  16. +3 −3 sys/altq/altq_priq.h
  17. +30 −30 sys/altq/altq_red.c
  18. +2 −2 sys/altq/altq_red.h
  19. +9 −9 sys/altq/altq_rio.c
  20. +4 −4 sys/altq/altq_rio.h
  21. +33 −33 sys/altq/altq_rmclass.c
  22. +2 −2 sys/altq/altq_rmclass.h
  23. +2 −2 sys/altq/altq_rmclass_debug.h
  24. +8 −8 sys/altq/altq_subr.c
  25. +12 −12 sys/altq/altq_wfq.c
  26. +2 −2 sys/altq/altq_wfq.h
  27. +2 −2 sys/altq/files.altq
  28. +2 −2 sys/altq/if_altq.h
  29. +3 −4 sys/arch/acorn26/acorn26/machdep.c
  30. +4 −4 sys/arch/acorn26/acorn26/vm_machdep.c
  31. +3 −2 sys/arch/acorn26/conf/FOURMEG
  32. +4 −1 sys/arch/acorn26/conf/GENERIC
  33. +3 −2 sys/arch/acorn26/conf/INSTALL
  34. +4 −3 sys/arch/acorn32/acorn32/hydra.c
  35. +6 −3 sys/arch/acorn32/conf/EB7500ATX
  36. +7 −3 sys/arch/acorn32/conf/GENERIC
  37. +5 −2 sys/arch/acorn32/conf/INSTALL
  38. +4 −1 sys/arch/acorn32/conf/LOWMEM_WSCONS
  39. +2 −1  sys/arch/acorn32/conf/NC
  40. +2 −1  sys/arch/acorn32/conf/NC_WSCONS
  41. +5 −2 sys/arch/acorn32/conf/RPC_WSCONS
  42. +2 −3 sys/arch/acorn32/conf/files.acorn32
  43. +4 −3 sys/arch/acorn32/dev/md_hooks.c
  44. +3 −3 sys/arch/acorn32/eb7500atx/rside.c
  45. +4 −3 sys/arch/acorn32/podulebus/esc.c
  46. +4 −3 sys/arch/acorn32/podulebus/sfas.c
  47. +16 −9 sys/arch/algor/algor/bus_dma.c
  48. +3 −3 sys/arch/algor/algor/machdep.c
  49. +9 −2 sys/arch/algor/conf/P4032
  50. +10 −2 sys/arch/algor/conf/P5064
  51. +10 −2 sys/arch/algor/conf/P6032
  52. +3 −2 sys/arch/algor/include/bus.h
  53. +7 −13 sys/arch/alpha/alpha/compat_16_machdep.c
  54. +3 −3 sys/arch/alpha/alpha/machdep.c
  55. +4 −4 sys/arch/alpha/alpha/vm_machdep.c
  56. +16 −9 sys/arch/alpha/common/bus_dma.c
  57. +14 −2 sys/arch/alpha/common/shared_intr.c
  58. +11 −2 sys/arch/alpha/conf/ALPHA
  59. +11 −2 sys/arch/alpha/conf/BASIL
  60. +11 −2 sys/arch/alpha/conf/FRAU-FARBISSINA
  61. +9 −1 sys/arch/alpha/conf/GENERIC
  62. +3 −1 sys/arch/alpha/conf/INSTALL
  63. +6 −1 sys/arch/alpha/conf/RAWHIDE
  64. +3 −2 sys/arch/alpha/include/bus.h
  65. +3 −3 sys/arch/alpha/include/frame.h
  66. +11 −1 sys/arch/alpha/include/ieee.h
  67. +3 −1 sys/arch/alpha/include/intr.h
  68. +9 −5 sys/arch/alpha/include/signal.h
  69. +4 −3 sys/arch/alpha/pci/pci_1000.c
  70. +4 −3 sys/arch/alpha/pci/pci_1000a.c
  71. +4 −3 sys/arch/alpha/pci/pci_2100_a500.c
  72. +4 −3 sys/arch/alpha/pci/pci_550.c
  73. +4 −3 sys/arch/alpha/pci/pci_6600.c
  74. +4 −3 sys/arch/alpha/pci/pci_eb164.c
  75. +4 −3 sys/arch/alpha/pci/pci_eb64plus.c
  76. +4 −3 sys/arch/alpha/pci/pci_eb66.c
  77. +4 −3 sys/arch/alpha/pci/pci_kn20aa.c
  78. +3 −3 sys/arch/alpha/pci/pci_kn300.c
  79. +4 −2 sys/arch/alpha/pci/sio_pic.c
  80. +3 −1 sys/arch/amd64/amd64/copy.S
  81. +3 −3 sys/arch/amd64/amd64/cpu.c
  82. +1,435 −3 sys/arch/amd64/amd64/db_disasm.c
  83. +16 −3 sys/arch/amd64/amd64/gdt.c
  84. +2 −3 sys/arch/amd64/amd64/locore.S
  85. +5 −4 sys/arch/amd64/amd64/machdep.c
  86. +10 −2 sys/arch/amd64/amd64/netbsd32_machdep.c
  87. +24 −90 sys/arch/amd64/amd64/pmap.c
  88. +6 −4 sys/arch/amd64/amd64/sys_machdep.c
  89. +4 −4 sys/arch/amd64/amd64/vm_machdep.c
  90. +23 −8 sys/arch/amd64/conf/GENERIC
  91. +16 −7 sys/arch/amd64/conf/INSTALL
  92. +18 −9 sys/arch/amd64/conf/INSTALL_ACPI
  93. +7 −1 sys/arch/amd64/conf/SIMICS
  94. +3 −0  sys/arch/amd64/include/bus_private.h
  95. +20 −2 sys/arch/amd64/include/vmparam.h
  96. +6 −1 sys/arch/amiga/amiga/isr.h
  97. +3 −3 sys/arch/amiga/amiga/machdep.c
  98. +18 −21 sys/arch/amiga/amiga/pmap.c
  99. +10 −3 sys/arch/amiga/conf/AMIGA
  100. +10 −3 sys/arch/amiga/conf/DRACO
  101. +10 −3 sys/arch/amiga/conf/GENERIC
  102. +13 −2 sys/arch/amiga/conf/GENERIC.in
  103. +5 −3 sys/arch/amiga/conf/INSTALL
  104. +2 −1  sys/arch/amiga/conf/MDINSTALL
  105. +10 −3 sys/arch/amiga/conf/WSCONS
  106. +2 −1  sys/arch/amiga/conf/majors.amiga
  107. +22 −21 sys/arch/amiga/dev/idesc.c
  108. +15 −30 sys/arch/amiga/dev/ite.c
  109. +3 −2 sys/arch/amiga/dev/itevar.h
  110. +62 −1 sys/arch/amiga/include/intr.h
  111. +3 −3 sys/arch/amiga/include/param.h
  112. +1 −72 sys/arch/amiga/include/psl.h
  113. +1 −3 sys/arch/amiga/include/types.h
  114. +7 −5 sys/arch/amiga/stand/bootblock/aout2bb/aout2bb.c
  115. +16 −1,202 sys/arch/amigappc/amigappc/locore.S
  116. +3 −3 sys/arch/amigappc/amigappc/machdep.c
  117. +3 −3 sys/arch/amigappc/conf/NULL
  118. +2 −2 sys/arch/amigappc/conf/std.amigappc
  119. +3 −0  sys/arch/amigappc/include/spr.h
  120. +3 −3 sys/arch/arc/Makefile
  121. +1 −5 sys/arch/arc/TODO
  122. +13 −21 sys/arch/arc/arc/arc_trap.c
  123. +37 −47 sys/arch/arc/arc/arcbios.c
  124. +55 −55 sys/arch/arc/arc/arcbios.h
  125. +10 −14 sys/arch/arc/arc/autoconf.c
  126. +71 −127 sys/arch/arc/arc/bus_dma.c
  127. +50 −79 sys/arch/arc/arc/bus_space.c
  128. +25 −35 sys/arch/arc/arc/bus_space_large.c
  129. +25 −34 sys/arch/arc/arc/bus_space_sparse.c
  130. +8 −6 sys/arch/arc/arc/c_isa.c
  131. +7 −10 sys/arch/arc/arc/c_jazz_eisa.c
  132. +21 −24 sys/arch/arc/arc/c_magnum.c
  133. +12 −14 sys/arch/arc/arc/c_nec_eisa.c
  134. +13 −18 sys/arch/arc/arc/c_nec_jazz.c
  135. +9 −14 sys/arch/arc/arc/c_nec_pci.c
  136. +6 −12 sys/arch/arc/arc/cpu.c
  137. +43 −51 sys/arch/arc/arc/disksubr.c
  138. +24 −32 sys/arch/arc/arc/machdep.c
  139. +22 −37 sys/arch/arc/arc/mainbus.c
  140. +137 −138 sys/arch/arc/arc/minidebug.c
  141. +5 −4 sys/arch/arc/arc/p_acer_pica_61.c
  142. +26 −24 sys/arch/arc/arc/p_dti_arcstation.c
  143. +25 −24 sys/arch/arc/arc/p_dti_tyne.c
  144. +5 −4 sys/arch/arc/arc/p_ms_jazz.c
  145. +5 −4 sys/arch/arc/arc/p_nec_jc94.c
  146. +3 −3 sys/arch/arc/arc/p_nec_r94.c
  147. +7 −7 sys/arch/arc/arc/p_nec_r96.c
  148. +9 −7 sys/arch/arc/arc/p_sni_rm200pci.c
  149. +11 −12 sys/arch/arc/arc/platform.c
  150. +6 −10 sys/arch/arc/arc/timer.c
  151. +3 −3 sys/arch/arc/arc/timervar.h
  152. +5 −7 sys/arch/arc/arc/todclock.c
  153. +24 −42 sys/arch/arc/arc/wired_map.c
  154. +6 −7 sys/arch/arc/arc/wired_map.h
  155. +4 −1 sys/arch/arc/conf/ARCTIC
  156. +7 −2 sys/arch/arc/conf/GENERIC
  157. +4 −1 sys/arch/arc/conf/M403
  158. +4 −1 sys/arch/arc/conf/MIMORI
  159. +4 −1 sys/arch/arc/conf/PCCONS
  160. +4 −1 sys/arch/arc/conf/PICA
  161. +6 −2 sys/arch/arc/conf/RAMDISK
  162. +6 −2 sys/arch/arc/conf/RPC44
  163. +29 −49 sys/arch/arc/dev/opms.c
  164. +5 −5 sys/arch/arc/dev/opmsvar.h
  165. +90 −133 sys/arch/arc/dev/pccons.c
  166. +13 −13 sys/arch/arc/dev/pcconsvar.h
  167. +53 −93 sys/arch/arc/dti/btl.c
  168. +4 −4 sys/arch/arc/dti/btlreg.h
  169. +4 −4 sys/arch/arc/dti/btlvar.h
  170. +7 −13 sys/arch/arc/dti/tyneisabr.c
  171. +7 −7 sys/arch/arc/include/autoconf.h
  172. +34 −18 sys/arch/{xen/include/xenkbcvar.h → arc/include/bootinfo.h}
  173. +176 −178 sys/arch/arc/include/bus.h
  174. +2 −2 sys/arch/arc/include/cpu.h
  175. +4 −3 sys/arch/arc/include/intr.h
  176. +61 −0 sys/arch/arc/include/loadfile_machdep.h
  177. +2 −2 sys/arch/arc/include/param.h
  178. +17 −19 sys/arch/arc/include/pci_machdep.h
  179. +7 −7 sys/arch/arc/include/pio.h
  180. +24 −24 sys/arch/arc/include/platform.h
  181. +3 −3 sys/arch/arc/include/trap.h
  182. +7 −13 sys/arch/arc/isa/arcsisabr.c
  183. +2 −4 sys/arch/arc/isa/isabrvar.h
  184. +35 −53 sys/arch/arc/isa/isabus.c
  185. +38 −40 sys/arch/arc/isa/isadma.c
  186. +20 −21 sys/arch/arc/isa/isadma_bounce.c
  187. +6 −10 sys/arch/arc/isa/isapnp_machdep.c
  188. +0 −68 sys/arch/arc/isa/joy_timer.c
  189. +13 −23 sys/arch/arc/isa/mcclock_isa.c
  190. +11 −16 sys/arch/arc/isa/opms_isa.c
  191. +17 −22 sys/arch/arc/isa/pccons_isa.c
  192. +2 −2 sys/arch/arc/isa/pccons_isavar.h
  193. +15 −22 sys/arch/arc/isa/timer_isa.c
  194. +16 −35 sys/arch/arc/jazz/asc.c
  195. +60 −96 sys/arch/arc/jazz/bus_dma_jazz.c
  196. +8 −13 sys/arch/arc/jazz/com_jazzio.c
  197. +39 −90 sys/arch/arc/jazz/fd.c
  198. +8 −18 sys/arch/arc/jazz/fdc_jazzio.c
  199. +4 −4 sys/arch/arc/jazz/if_sn_jazzio.c
  200. +15 −27 sys/arch/arc/jazz/jazzdmatlb.c
  201. +3 −3 sys/arch/arc/jazz/jazzdmatlbreg.h
  202. +9 −10 sys/arch/arc/jazz/jazzdmatlbvar.h
  203. +18 −33 sys/arch/arc/jazz/jazzio.c
  204. +2 −2 sys/arch/arc/jazz/jazziovar.h
  205. +7 −13 sys/arch/arc/jazz/jazzisabr.c
  206. +12 −21 sys/arch/arc/jazz/lpt_jazzio.c
  207. +7 −13 sys/arch/arc/jazz/mcclock_jazzio.c
  208. +6 −12 sys/arch/arc/jazz/oosiop_jazzio.c
  209. +9 −14 sys/arch/arc/jazz/opms_jazzio.c
  210. +11 −18 sys/arch/arc/jazz/osiop_jazzio.c
  211. +20 −28 sys/arch/arc/jazz/pccons_jazzio.c
  212. +2 −2 sys/arch/arc/jazz/pccons_jazziovar.h
  213. +14 −18 sys/arch/arc/jazz/pckbc_jazzio.c
  214. +12 −18 sys/arch/arc/jazz/timer_jazzio.c
  215. +4 −4 sys/arch/arc/jazz/timer_jazziovar.h
  216. +20 −30 sys/arch/arc/jazz/vga_jazzio.c
  217. +2 −2 sys/arch/arc/jazz/vga_jazziovar.h
  218. +54 −85 sys/arch/arc/pci/necpb.c
  219. +3 −3 sys/arch/arc/pci/necpbvar.h
  220. +2 −3 sys/arch/arc/stand/Makefile
  221. +5 −0 sys/arch/arc/stand/Makefile.inc
  222. +91 −0 sys/arch/arc/stand/boot/Makefile
  223. +287 −0 sys/arch/arc/stand/boot/boot.c
  224. +67 −0 sys/arch/arc/stand/boot/bootinfo.c
  225. +44 −0 sys/arch/arc/stand/boot/bootinfo.h
  226. +45 −0 sys/arch/arc/stand/boot/common.h
  227. +123 −0 sys/arch/arc/stand/boot/conf.c
  228. +147 −0 sys/arch/arc/stand/boot/devopen.c
  229. +205 −0 sys/arch/arc/stand/boot/disk.c
  230. +38 −0 sys/arch/arc/stand/boot/disk.h
  231. +54 −0 sys/arch/arc/stand/boot/getchar.c
  232. +106 −0 sys/arch/arc/stand/boot/getopt.c
  233. +57 −0 sys/arch/arc/stand/boot/putchar.c
  234. +127 −0 sys/arch/arc/stand/boot/start.S
  235. +7 −0 sys/arch/arc/stand/boot/version
  236. +0 −16 sys/arch/arc/stand/libsa/Makefile
  237. +0 −124 sys/arch/arc/stand/libsa/devopen.c
  238. +0 −12 sys/arch/arc/stand/mbr/Makefile
  239. +0 −15 sys/arch/arc/stand/mbr/mbr.uue
  240. +0 −208 sys/arch/arc/stand/mbr/msdos5mb.gz.uue
  241. +3 −3 sys/arch/arm/arm32/arm32_machdep.c
  242. +13 −6 sys/arch/arm/arm32/bus_dma.c
  243. +14 −7 sys/arch/arm/arm32/pmap.c
  244. +4 −4 sys/arch/arm/arm32/vm_machdep.c
  245. +2 −1  sys/arch/arm/conf/majors.arm32
  246. +7 −4 sys/arch/arm/ep93xx/ep93xx_space.c
  247. +3 −1 sys/arch/arm/ep93xx/ep93xxreg.h
  248. +3 −3 sys/arch/arm/ep93xx/epclk.c
  249. +116 −82 sys/arch/arm/ep93xx/epe.c
  250. +3 −1 sys/arch/arm/ep93xx/epereg.h
  251. +2 −1  sys/arch/arm/ep93xx/epevar.h
  252. +6 −4 sys/arch/arm/footbridge/footbridge_io.c
  253. +0 −77 sys/arch/arm/footbridge/isa/joy_timer.c
  254. +1 −1  sys/arch/arm/include/aout_machdep.h
  255. +3 −2 sys/arch/arm/include/bus.h
  256. +11 −1 sys/arch/arm/include/ieee.h
  257. +2 −2 sys/arch/arm/include/stdarg.h
  258. +6 −5 sys/arch/arm/iomd/console/vidcrender.c
  259. +2 −2 sys/arch/arm/iomd/iomd_clock.c
  260. +6 −5 sys/arch/arm/iomd/vidc20config.c
  261. +5 −4 sys/arch/arm/ixp12x0/ixp12x0_io.c
  262. +3 −3 sys/arch/arm/mainbus/mainbus_io.c
  263. +31 −17 sys/arch/arm/s3c2xx0/s3c2410.c
  264. +2 −1  sys/arch/arm/s3c2xx0/s3c24x0var.h
  265. +27 −14 sys/arch/arm/s3c2xx0/s3c2800.c
  266. +3 −3 sys/arch/arm/s3c2xx0/s3c2800_pci.c
  267. +3 −2 sys/arch/arm/s3c2xx0/s3c2800reg.h
  268. +3 −2 sys/arch/arm/s3c2xx0/s3c2800var.h
  269. +21 −9 sys/arch/arm/s3c2xx0/s3c2xx0_space.c
  270. +3 −3 sys/arch/arm/sa11x0/sa11x0_io.c
  271. +3 −3 sys/arch/arm/xscale/becc_timer.c
  272. +3 −1 sys/arch/arm/xscale/files.i80321
  273. +12 −1 sys/arch/arm/xscale/files.pxa2x0
  274. +6 −4 sys/arch/arm/xscale/i80312_space.c
  275. +7 −4 sys/arch/arm/xscale/i80321_space.c
  276. +6 −3 sys/arch/arm/xscale/i80321_timer.c
  277. +5 −4 sys/arch/arm/xscale/ixp425_pci_space.c
  278. +7 −4 sys/arch/arm/xscale/ixp425_space.c
  279. +3 −3 sys/arch/arm/xscale/ixp425_timer.c
  280. +952 −0 sys/arch/arm/xscale/pxa2x0_ac97.c
  281. +1,302 −0 sys/arch/arm/xscale/pxa2x0_dmac.c
  282. +155 −0 sys/arch/arm/xscale/pxa2x0_dmac.h
  283. +19 −11 sys/arch/arm/xscale/pxa2x0_space.c
  284. +19 −9 sys/arch/atari/atari/bus.c
  285. +3 −24 sys/arch/atari/atari/machdep.c
  286. +18 −20 sys/arch/atari/atari/pmap.c
  287. +13 −9 sys/arch/atari/conf/ATARITT
  288. +10 −9 sys/arch/atari/conf/BOOT
  289. +10 −9 sys/arch/atari/conf/BOOTX
  290. +13 −9 sys/arch/atari/conf/FALCON
  291. +12 −8 sys/arch/atari/conf/GENERIC.in
  292. +13 −9 sys/arch/atari/conf/HADES
  293. +13 −9 sys/arch/atari/conf/MILAN-ISAIDE
  294. +13 −9 sys/arch/atari/conf/MILAN-PCIIDE
  295. +24 −44 sys/arch/atari/dev/ite.c
  296. +3 −2 sys/arch/atari/dev/itevar.h
  297. +8 −6 sys/arch/atari/dev/ncr5380.c
  298. +6 −6 sys/arch/atari/dev/ser.c
  299. +3 −2 sys/arch/atari/include/bus.h
  300. +1 −6 sys/arch/atari/include/psl.h
Sorry, we could not display the entire diff because too many files (4,163) changed.
View
18 sys/altq/altq_afmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_afmap.c,v 1.7 2004/04/21 18:40:37 itojun Exp $ */
+/* $NetBSD: altq_afmap.c,v 1.7.4.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_afmap.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_afmap.c,v 1.7 2004/04/21 18:40:37 itojun Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_afmap.c,v 1.7.4.1 2005/04/29 11:27:58 kent Exp $");
#ifdef _KERNEL_OPT
#include "opt_altq.h"
@@ -79,7 +79,7 @@ afm_alloc(ifp)
struct ifnet *ifp;
{
struct afm_head *head;
-
+
MALLOC(head, struct afm_head *, sizeof(struct afm_head),
M_DEVBUF, M_WAITOK);
if (head == NULL)
@@ -90,10 +90,10 @@ afm_alloc(ifp)
LIST_INIT(&head->afh_head);
head->afh_ifp = ifp;
-
+
/* add this afm_head to the chain */
LIST_INSERT_HEAD(&afhead_chain, head, afh_chain);
-
+
return (0);
}
@@ -130,7 +130,7 @@ afm_top(ifp)
break;
if (head == NULL)
return NULL;
-
+
return (head->afh_head.lh_first);
}
@@ -174,7 +174,7 @@ int afm_add(ifp, flowmap)
return 0;
}
-int
+int
afm_remove(afm)
struct afm *afm;
{
@@ -183,7 +183,7 @@ afm_remove(afm)
return (0);
}
-int
+int
afm_removeall(ifp)
struct ifnet *ifp;
{
@@ -395,7 +395,7 @@ afmioctl(dev, cmd, addr, flag, p)
/* lookup interface */
flowmap = (struct atm_flowmap *)addr;
- flowmap->af_ifname[IFNAMSIZ-1] = '\0';
+ flowmap->af_ifname[IFNAMSIZ-1] = '\0';
ifp = ifunit(flowmap->af_ifname);
if (ifp == NULL || ifp->if_ioctl == NULL ||
(ifp->if_flags & IFF_RUNNING) == 0)
View
26 sys/altq/altq_blue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_blue.c,v 1.10 2004/06/26 07:22:11 abs Exp $ */
+/* $NetBSD: altq_blue.c,v 1.10.4.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_blue.c,v 1.8 2002/01/07 11:25:40 kjc Exp $ */
/*
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.10 2004/06/26 07:22:11 abs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_blue.c,v 1.10.4.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -181,7 +181,7 @@ blueioctl(dev, cmd, addr, flag, p)
#endif
break;
}
-
+
switch (cmd) {
case BLUE_ENABLE:
@@ -217,7 +217,7 @@ blueioctl(dev, cmd, addr, flag, p)
M_DEVBUF, M_WAITOK);
(void)memset(rqp->rq_q, 0, sizeof(class_queue_t));
- MALLOC(rqp->rq_blue, blue_t *, sizeof(blue_t), M_DEVBUF, M_WAITOK);
+ MALLOC(rqp->rq_blue, blue_t *, sizeof(blue_t), M_DEVBUF, M_WAITOK);
(void)memset(rqp->rq_blue, 0, sizeof(blue_t));
rqp->rq_ifq = &ifp->if_snd;
@@ -304,7 +304,7 @@ blueioctl(dev, cmd, addr, flag, p)
if (fc->blue_hold_time > 0)
rqp->rq_blue->blue_hold_time = fc->blue_hold_time;
rqp->rq_blue->blue_flags = fc->blue_flags;
-
+
blue_init(rqp->rq_blue, rqp->rq_blue->blue_flags,
rqp->rq_blue->blue_pkttime,
rqp->rq_blue->blue_max_pmark,
@@ -353,7 +353,7 @@ static int blue_detach(rqp)
* blue support routines
*/
-int
+int
blue_init(rp, flags, pkttime, blue_max_pmark, blue_hold_time)
blue_t *rp;
int flags;
@@ -362,7 +362,7 @@ blue_init(rp, flags, pkttime, blue_max_pmark, blue_hold_time)
int blue_hold_time;
{
int npkts_per_sec;
-
+
rp->blue_idle = 1;
rp->blue_flags = flags;
rp->blue_pkttime = pkttime;
@@ -416,11 +416,11 @@ blue_addq(rp, q, m, pktattr)
struct altq_pktattr *pktattr;
{
int droptype;
-
+
/*
* if we were idle, this is an enqueue onto an empty queue
* and we should decrement marking probability
- *
+ *
*/
if (rp->blue_idle) {
struct timeval now;
@@ -451,7 +451,7 @@ blue_addq(rp, q, m, pktattr)
#ifdef BLUE_STATS
rp->blue_stats.marked_packets++;
#endif
- } else {
+ } else {
/* unforced drop by blue */
droptype = DTYPE_EARLY;
}
@@ -551,7 +551,7 @@ mark_ecn(m, pktattr, flags)
struct ip *ip = (struct ip *)pktattr->pattr_hdr;
u_int8_t otos;
int sum;
-
+
if (ip->ip_v != 4)
return (0); /* version mismatch! */
if ((ip->ip_tos & IPTOS_ECN_MASK) == IPTOS_ECN_NOTECT)
@@ -625,7 +625,7 @@ blue_dequeue(ifq, op)
if (op == ALTDQ_POLL)
return (qhead(rqp->rq_q));
-
+
m = blue_getq(rqp->rq_blue, rqp->rq_q);
if (m != NULL)
ifq->ifq_len--;
@@ -637,7 +637,7 @@ struct mbuf *blue_getq(rp, q)
class_queue_t *q;
{
struct mbuf *m;
-
+
if ((m = _getq(q)) == NULL) {
if (rp->blue_idle == 0) {
rp->blue_idle = 1;
View
4 sys/altq/altq_blue.h
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_blue.h,v 1.2 2000/12/14 08:49:49 thorpej Exp $ */
+/* $NetBSD: altq_blue.h,v 1.2.34.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_blue.h,v 1.5 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -64,7 +64,7 @@ struct blue_conf {
#define BLUEF_ECN6 0x02 /* use packet marking for IPv6 packets */
#define BLUEF_ECN (BLUEF_ECN4 | BLUEF_ECN6)
-/*
+/*
* IOCTLs for BLUE
*/
#define BLUE_IF_ATTACH _IOW('Q', 1, struct blue_interface)
View
14 sys/altq/altq_cbq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.c,v 1.10 2004/04/23 02:58:28 simonb Exp $ */
+/* $NetBSD: altq_cbq.c,v 1.10.4.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_cbq.c,v 1.11 2002/10/04 14:24:09 kjc Exp $ */
/*
@@ -27,12 +27,12 @@
* SUN MICROSYSTEMS DOES NOT CLAIM MERCHANTABILITY OF THIS SOFTWARE OR THE
* SUITABILITY OF THIS SOFTWARE FOR ANY PARTICULAR PURPOSE. The software is
* provided "as is" without express or implied warranty of any kind.
- *
+ *
* These notices must be retained in any copies of any part of this software.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.10 2004/04/23 02:58:28 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cbq.c,v 1.10.4.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -378,11 +378,11 @@ cbq_delete_filter(dfp)
{
char *ifacename;
cbq_state_t *cbqp;
-
+
ifacename = dfp->cbq_iface.cbq_ifacename;
if ((cbqp = altq_lookup(ifacename, ALTQT_CBQ)) == NULL)
return (EBADF);
-
+
return acc_delete_filter(&cbqp->cbq_classifier,
dfp->cbq_filter_handle);
}
@@ -632,7 +632,7 @@ cbq_ifattach(ifacep)
sizeof(struct rm_class *) * CBQ_MAX_CLASSES);
new_cbqp->cbq_qlen = 0;
new_cbqp->ifnp.ifq_ = &ifp->if_snd; /* keep the ifq */
-
+
/*
* set CBQ to this ifnet structure.
*/
@@ -939,7 +939,7 @@ static void cbq_class_dump(i)
return;
}
cl = cbq_list->cbq_class_tbl[i];
-
+
printf("class %d cl=%p\n", i, cl);
if (cl != NULL) {
s = &cl->stats_;
View
16 sys/altq/altq_cbq.h
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.h,v 1.5 2003/08/20 23:32:25 itojun Exp $ */
+/* $NetBSD: altq_cbq.h,v 1.5.8.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_cbq.h,v 1.5 2000/12/02 13:44:40 kjc Exp $ */
/*
@@ -27,7 +27,7 @@
* SUN MICROSYSTEMS DOES NOT CLAIM MERCHANTABILITY OF THIS SOFTWARE OR THE
* SUITABILITY OF THIS SOFTWARE FOR ANY PARTICULAR PURPOSE. The software is
* provided "as is" without express or implied warranty of any kind.
- *
+ *
* These notices must be retained in any copies of any part of this software.
*/
@@ -44,7 +44,7 @@
#ifdef __cplusplus
extern "C" {
-#endif
+#endif
/*
* Define a well known class handles
@@ -72,7 +72,7 @@ typedef struct cbq_class_spec {
u_int nano_sec_per_byte;
u_int maxq;
u_int maxidle;
- int minidle;
+ int minidle;
u_int offtime;
u_long parent_class_handle;
u_long borrow_class_handle;
@@ -104,7 +104,7 @@ typedef struct cbq_class_spec {
struct cbq_add_class {
struct cbq_interface cbq_iface;
- cbq_class_spec_t cbq_class;
+ cbq_class_spec_t cbq_class;
u_long cbq_class_handle;
};
@@ -116,7 +116,7 @@ struct cbq_delete_class {
struct cbq_modify_class {
struct cbq_interface cbq_iface;
- cbq_class_spec_t cbq_class;
+ cbq_class_spec_t cbq_class;
u_long cbq_class_handle;
};
@@ -168,7 +168,7 @@ struct cbq_getstats {
class_stats_t *stats;
};
-/*
+/*
* Define IOCTLs for CBQ.
*/
#define CBQ_IF_ATTACH _IOW('Q', 1, struct cbq_interface)
@@ -216,6 +216,6 @@ typedef struct cbqstate {
#ifdef __cplusplus
}
-#endif
+#endif
#endif /* !_ALTQ_ALTQ_CBQ_H_ */
View
34 sys/altq/altq_cdnr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cdnr.c,v 1.8 2004/02/13 11:36:09 wiz Exp $ */
+/* $NetBSD: altq_cdnr.c,v 1.8.8.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_cdnr.c,v 1.8 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_cdnr.c,v 1.8 2004/02/13 11:36:09 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_cdnr.c,v 1.8.8.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -160,7 +160,7 @@ altq_cdnr_input(m, af)
#ifdef INET6
if (af == AF_INET6) {
u_int32_t flowlabel;
-
+
flowlabel = ((struct ip6_hdr *)ip)->ip6_flow;
pktinfo.pkt_dscp = (ntohl(flowlabel) >> 20) & DSCP_MASK;
} else
@@ -179,7 +179,7 @@ altq_cdnr_input(m, af)
while (1) {
PKTCNTR_ADD(&top->tc_cnts[tca->tca_code], pktinfo.pkt_len);
-
+
switch (tca->tca_code) {
case TCACODE_PASS:
return (1);
@@ -237,7 +237,7 @@ cdnr_handle2cb(handle)
cb = (struct cdnr_block *)handle;
if (handle != ALIGN(cb))
return (NULL);
-
+
if (cb == NULL || cb->cb_handle != handle)
return (NULL);
return (cb);
@@ -284,7 +284,7 @@ cdnr_cballoc(top, type, input_func)
if (cb == NULL)
return (NULL);
(void)memset(cb, 0, size);
-
+
cb->cb_len = size;
cb->cb_type = type;
cb->cb_ref = 0;
@@ -465,7 +465,7 @@ top_destroy(top)
if (cb != NULL)
generic_element_destroy(cb);
}
-
+
LIST_REMOVE(top, tc_next);
cdnr_cbdestroy(top);
@@ -582,7 +582,7 @@ tbm_destroy(tbm)
cdnr_cbdestroy(tbm);
return (0);
}
-
+
static struct tc_action *
tbm_input(cb, pktinfo)
struct cdnr_block *cb;
@@ -591,7 +591,7 @@ tbm_input(cb, pktinfo)
struct tbmeter *tbm = (struct tbmeter *)cb;
u_int64_t len;
u_int64_t interval, now;
-
+
len = TB_SCALE(pktinfo->pkt_len);
if (tbm->tb.token < len) {
@@ -606,7 +606,7 @@ tbm_input(cb, pktinfo)
}
tbm->tb.last = now;
}
-
+
if (tbm->tb.token < len) {
PKTCNTR_ADD(&tbm->out_cnt, pktinfo->pkt_len);
return (&tbm->out_action);
@@ -680,7 +680,7 @@ trtcm_destroy(tcm)
cdnr_cbdestroy(tcm);
return (0);
}
-
+
static struct tc_action *
trtcm_input(cb, pktinfo)
struct cdnr_block *cb;
@@ -724,7 +724,7 @@ trtcm_input(cb, pktinfo)
}
tcm->peak_tb.last = now;
}
-
+
if (color == tcm->red_dscp || tcm->peak_tb.token < len) {
pktinfo->pkt_dscp = tcm->red_dscp;
PKTCNTR_ADD(&tcm->red_cnt, pktinfo->pkt_len);
@@ -847,7 +847,7 @@ tswtcm_input(cb, pktinfo)
*/
if (avg_rate > tsw->cmtd_rate) {
u_int32_t randval = random() % avg_rate;
-
+
if (avg_rate > tsw->peak_rate) {
if (randval < avg_rate - tsw->peak_rate) {
/* mark red */
@@ -1066,13 +1066,13 @@ cdnrcmd_tcm_stats(ap)
if (cb->cb_type == TCETYPE_TRTCM) {
struct trtcm *tcm = (struct trtcm *)cb;
-
+
ap->green_cnt = tcm->green_cnt;
ap->yellow_cnt = tcm->yellow_cnt;
ap->red_cnt = tcm->red_cnt;
} else if (cb->cb_type == TCETYPE_TSWTCM) {
struct tswtcm *tsw = (struct tswtcm *)cb;
-
+
ap->green_cnt = tsw->green_cnt;
ap->yellow_cnt = tsw->yellow_cnt;
ap->red_cnt = tsw->red_cnt;
@@ -1264,10 +1264,10 @@ cdnrioctl(dev, cmd, addr, flag, p)
return (error);
break;
}
-
+
s = splnet();
switch (cmd) {
-
+
case CDNR_IF_ATTACH:
ifacep = (struct cdnr_interface *)addr;
error = cdnrcmd_if_attach(ifacep->cdnr_ifname);
View
6 sys/altq/altq_cdnr.h
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cdnr.h,v 1.2 2000/12/14 08:49:50 thorpej Exp $ */
+/* $NetBSD: altq_cdnr.h,v 1.2.34.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_cdnr.h,v 1.6 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -117,7 +117,7 @@ struct cdnr_tbmeter_stats {
struct cdnr_add_trtcm {
struct cdnr_interface iface;
struct tb_profile cmtd_profile; /* profile for committed tb */
- struct tb_profile peak_profile; /* profile for peak tb */
+ struct tb_profile peak_profile; /* profile for peak tb */
struct tc_action green_action; /* action for green packets */
struct tc_action yellow_action; /* action for yellow packets */
struct tc_action red_action; /* action for red packets */
@@ -130,7 +130,7 @@ struct cdnr_modify_trtcm {
struct cdnr_interface iface;
u_long cdnr_handle;
struct tb_profile cmtd_profile; /* profile for committed tb */
- struct tb_profile peak_profile; /* profile for peak tb */
+ struct tb_profile peak_profile; /* profile for peak tb */
int coloraware; /* color-aware/color-blind */
};
View
18 sys/altq/altq_classq.h
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_classq.h,v 1.3 2001/04/06 00:44:46 thorpej Exp $ */
+/* $NetBSD: altq_classq.h,v 1.3.30.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_classq.h,v 1.3 2000/07/25 10:12:29 kjc Exp $ */
/*
@@ -89,11 +89,11 @@ extern void _flushq(class_queue_t *);
/*
* inlined versions
*/
-static __inline void
+static __inline void
_addq(class_queue_t *q, struct mbuf *m)
{
struct mbuf *m0;
-
+
if ((m0 = qtail(q)) != NULL)
m->m_nextpkt = m0->m_nextpkt;
else
@@ -107,7 +107,7 @@ static __inline struct mbuf *
_getq(class_queue_t *q)
{
struct mbuf *m, *m0;
-
+
if ((m = qtail(q)) == NULL)
return (NULL);
if ((m0 = m->m_nextpkt) != m)
@@ -116,7 +116,7 @@ _getq(class_queue_t *q)
qtail(q) = NULL;
qlen(q)--;
m0->m_nextpkt = NULL;
- return (m0);
+ return (m0);
}
/* drop a packet at the tail of the queue */
@@ -132,7 +132,7 @@ _getq_tail(class_queue_t *q)
m0 = m0->m_nextpkt;
} while (m0 != m);
prev->m_nextpkt = m->m_nextpkt;
- if (prev == m)
+ if (prev == m)
qtail(q) = NULL;
else
qtail(q) = prev;
@@ -154,7 +154,7 @@ _getq_random(class_queue_t *q)
qtail(q) = NULL;
else {
struct mbuf *prev = NULL;
-
+
n = random() % qlen(q) + 1;
for (i = 0; i < n; i++) {
prev = m;
@@ -173,14 +173,14 @@ static __inline void
_removeq(class_queue_t *q, struct mbuf *m)
{
struct mbuf *m0, *prev;
-
+
m0 = qtail(q);
do {
prev = m0;
m0 = m0->m_nextpkt;
} while (m0 != m);
prev->m_nextpkt = m->m_nextpkt;
- if (prev == m)
+ if (prev == m)
qtail(q) = NULL;
else if (qtail(q) == m)
qtail(q) = prev;
View
14 sys/altq/altq_conf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_conf.c,v 1.10 2002/10/23 09:10:25 jdolecek Exp $ */
+/* $NetBSD: altq_conf.c,v 1.10.14.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_conf.c,v 1.13 2002/01/29 10:16:01 kjc Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_conf.c,v 1.10 2002/10/23 09:10:25 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_conf.c,v 1.10.14.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -189,14 +189,14 @@ void altqattach __P((int));
#if defined(__FreeBSD__)
#if (__FreeBSD_version < 400000)
-static struct cdevsw altq_cdevsw =
+static struct cdevsw altq_cdevsw =
{ altqopen, altqclose, noread, nowrite,
altqioctl, nostop, nullreset, nodevtotty,
seltrue, nommap, NULL, "altq", NULL, -1 };
#else
-static struct cdevsw altq_cdevsw =
+static struct cdevsw altq_cdevsw =
{ altqopen, altqclose, noread, nowrite,
- altqioctl, seltrue, nommap, nostrategy,
+ altqioctl, seltrue, nommap, nostrategy,
"altq", CDEV_MAJOR, nodump, nopsize, 0, -1 };
#endif
#endif
@@ -392,7 +392,7 @@ void altq_module_declref(type)
altq_modules[type]->ref--;
}
-static int
+static int
altq_module_register(mdata)
struct altq_module_data *mdata;
{
@@ -407,7 +407,7 @@ altq_module_register(mdata)
return (0);
}
-static int
+static int
altq_module_deregister(mdata)
struct altq_module_data *mdata;
{
View
8 sys/altq/altq_fifoq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_fifoq.c,v 1.5 2003/11/09 22:11:12 christos Exp $ */
+/* $NetBSD: altq_fifoq.c,v 1.5.8.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_fifoq.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_fifoq.c,v 1.5 2003/11/09 22:11:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_fifoq.c,v 1.5.8.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -143,7 +143,7 @@ fifoqioctl(dev, cmd, addr, flag, p)
#endif
break;
}
-
+
switch (cmd) {
case FIFOQ_ENABLE:
ifacep = (struct fifoq_interface *)addr;
@@ -321,7 +321,7 @@ fifoq_dequeue(ifq, op)
if (op == ALTDQ_POLL)
return (q->q_head);
-
+
if ((m = q->q_head) == NULL)
return (NULL);
View
4 sys/altq/altq_fifoq.h
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_fifoq.h,v 1.4 2004/06/22 12:45:57 itojun Exp $ */
+/* $NetBSD: altq_fifoq.h,v 1.4.4.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_fifoq.h,v 1.6 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -69,7 +69,7 @@ struct fifoq_conf {
#define FIFOQ_LIMIT 50 /* default max queue length */
-/*
+/*
* IOCTLs for FIFOQ
*/
#define FIFOQ_IF_ATTACH _IOW('Q', 1, struct fifoq_interface)
View
98 sys/altq/altq_hfsc.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_hfsc.c,v 1.9 2004/02/13 11:36:09 wiz Exp $ */
+/* $NetBSD: altq_hfsc.c,v 1.9.8.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_hfsc.c,v 1.9 2001/10/26 04:56:11 kjc Exp $ */
/*
@@ -35,13 +35,13 @@
*/
/*
* H-FSC is described in Proceedings of SIGCOMM'97,
- * "A Hierarchical Fair Service Curve Algorithm for Link-Sharing,
+ * "A Hierarchical Fair Service Curve Algorithm for Link-Sharing,
* Real-Time and Priority Service"
* by Ion Stoica, Hui Zhang, and T. S. Eugene Ng.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.9 2004/02/13 11:36:09 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_hfsc.c,v 1.9.8.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -210,7 +210,7 @@ hfsc_detach(hif)
hif_list = hif->hif_next;
else {
struct hfsc_if *h;
-
+
for (h = hif_list; h != NULL; h = h->hif_next)
if (h->hif_next == hif) {
h->hif_next = hif->hif_next;
@@ -252,7 +252,7 @@ hfsc_clear_interface(hif)
}
}
}
-
+
return (0);
}
@@ -575,7 +575,7 @@ hfsc_nextclass(cl)
* hfsc_enqueue is an enqueue function to be registered to
* (*altq_enqueue) in struct ifaltq.
*/
-static int
+static int
hfsc_enqueue(ifq, m, pktattr)
struct ifaltq *ifq;
struct mbuf *m;
@@ -635,7 +635,7 @@ hfsc_dequeue(ifq, op)
if (op == ALTDQ_REMOVE && hif->hif_pollcache != NULL) {
u_int64_t cur_time;
-
+
cl = hif->hif_pollcache;
hif->hif_pollcache = NULL;
/* check if the class was scheduled by real-time criteria */
@@ -685,7 +685,7 @@ hfsc_dequeue(ifq, op)
if (cl->cl_rsc != NULL) {
/* update ed */
next_len = m_pktlen(qhead(cl->cl_q));
-
+
if (realtime)
update_ed(cl, next_len);
else
@@ -767,11 +767,11 @@ hfsc_purgeq(cl)
m_freem(m);
}
ASSERT(qlen(cl->cl_q) == 0);
-
+
set_passive(cl);
}
-static void
+static void
set_active(cl, len)
struct hfsc_class *cl;
int len;
@@ -784,7 +784,7 @@ set_active(cl, len)
cl->cl_stats.period++;
}
-static void
+static void
set_passive(cl)
struct hfsc_class *cl;
{
@@ -806,7 +806,7 @@ set_passive(cl)
}
}
-static void
+static void
init_ed(cl, next_len)
struct hfsc_class *cl;
int next_len;
@@ -836,7 +836,7 @@ init_ed(cl, next_len)
ellist_insert(cl);
}
-static void
+static void
update_ed(cl, next_len)
struct hfsc_class *cl;
int next_len;
@@ -847,7 +847,7 @@ update_ed(cl, next_len)
ellist_update(cl);
}
-static void
+static void
update_d(cl, next_len)
struct hfsc_class *cl;
int next_len;
@@ -855,7 +855,7 @@ update_d(cl, next_len)
cl->cl_d = rtsc_y2x(&cl->cl_deadline, cl->cl_cumul + next_len);
}
-static void
+static void
init_v(cl, len)
struct hfsc_class *cl;
int len;
@@ -863,7 +863,7 @@ init_v(cl, len)
struct hfsc_class *min_cl, *max_cl;
while (cl->cl_parent != NULL) {
-
+
if (cl->cl_nactive++ > 0)
/* already active */
break;
@@ -909,7 +909,7 @@ init_v(cl, len)
}
}
-static void
+static void
update_v(cl, len)
struct hfsc_class *cl;
int len;
@@ -943,7 +943,7 @@ static ellist_t *
ellist_alloc()
{
ellist_t *head;
-
+
MALLOC(head, ellist_t *, sizeof(ellist_t), M_DEVBUF, M_WAITOK);
TAILQ_INIT(head);
return (head);
@@ -956,7 +956,7 @@ ellist_destroy(head)
FREE(head, M_DEVBUF);
}
-static void
+static void
ellist_insert(cl)
struct hfsc_class *cl;
{
@@ -979,16 +979,16 @@ ellist_insert(cl)
ASSERT(0); /* should not reach here */
}
-static void
+static void
ellist_remove(cl)
struct hfsc_class *cl;
{
struct hfsc_if *hif = cl->cl_hif;
-
+
TAILQ_REMOVE(hif->hif_eligible, cl, cl_ellist);
}
-static void
+static void
ellist_update(cl)
struct hfsc_class *cl;
{
@@ -1054,7 +1054,7 @@ static actlist_t *
actlist_alloc()
{
actlist_t *head;
-
+
MALLOC(head, actlist_t *, sizeof(actlist_t), M_DEVBUF, M_WAITOK);
TAILQ_INIT(head);
return (head);
@@ -1066,7 +1066,7 @@ actlist_destroy(head)
{
FREE(head, M_DEVBUF);
}
-static void
+static void
actlist_insert(cl)
struct hfsc_class *cl;
{
@@ -1088,7 +1088,7 @@ actlist_insert(cl)
ASSERT(0); /* should not reach here */
}
-static void
+static void
actlist_remove(cl)
struct hfsc_class *cl;
{
@@ -1154,7 +1154,7 @@ actlist_update(cl)
* bytes/nsec 12.5e-6 125e-6 1250e-6 12500e-6 125000e-6
* sm(500MHz) 25.0e-6 250e-6 2500e-6 25000e-6 250000e-6
* sm(200MHz) 62.5e-6 625e-6 6250e-6 62500e-6 625000e-6
- *
+ *
* nsec/byte 80000 8000 800 80 8
* ism(500MHz) 40000 4000 400 40 4
* ism(200MHz) 16000 1600 160 16 1.6
@@ -1165,7 +1165,7 @@ actlist_update(cl)
#define SC_LARGEVAL (1LL << 32)
#define SC_INFINITY 0xffffffffffffffffLL
-static __inline u_int64_t
+static __inline u_int64_t
seg_x2y(x, sm)
u_int64_t x;
u_int64_t sm;
@@ -1179,7 +1179,7 @@ seg_x2y(x, sm)
return (y);
}
-static __inline u_int64_t
+static __inline u_int64_t
seg_y2x(y, ism)
u_int64_t y;
u_int64_t ism;
@@ -1197,7 +1197,7 @@ seg_y2x(y, ism)
return (x);
}
-static __inline u_int64_t
+static __inline u_int64_t
m2sm(m)
u_int m;
{
@@ -1207,7 +1207,7 @@ m2sm(m)
return (sm);
}
-static __inline u_int64_t
+static __inline u_int64_t
m2ism(m)
u_int m;
{
@@ -1220,17 +1220,17 @@ m2ism(m)
return (ism);
}
-static __inline u_int64_t
+static __inline u_int64_t
d2dx(d)
u_int d;
{
u_int64_t dx;
-
+
dx = ((u_int64_t)d * machclk_freq) / 1000;
return (dx);
}
-static u_int
+static u_int
sm2m(sm)
u_int64_t sm;
{
@@ -1240,7 +1240,7 @@ sm2m(sm)
return ((u_int)m);
}
-static u_int
+static u_int
dx2d(dx)
u_int64_t dx;
{
@@ -1250,7 +1250,7 @@ dx2d(dx)
return ((u_int)d);
}
-static void
+static void
sc2isc(sc, isc)
struct service_curve *sc;
struct internal_sc *isc;
@@ -1267,7 +1267,7 @@ sc2isc(sc, isc)
* initialize the runtime service curve with the given internal
* service curve starting at (x, y).
*/
-static void
+static void
rtsc_init(rtsc, isc, x, y)
struct runtime_sc *rtsc;
struct internal_sc *isc;
@@ -1287,7 +1287,7 @@ rtsc_init(rtsc, isc, x, y)
* calculate the y-projection of the runtime service curve by the
* given x-projection value
*/
-static u_int64_t
+static u_int64_t
rtsc_y2x(rtsc, y)
struct runtime_sc *rtsc;
u_int64_t y;
@@ -1310,7 +1310,7 @@ rtsc_y2x(rtsc, y)
return (x);
}
-static u_int64_t
+static u_int64_t
rtsc_x2y(rtsc, x)
struct runtime_sc *rtsc;
u_int64_t x;
@@ -1333,7 +1333,7 @@ rtsc_x2y(rtsc, x)
* update the runtime service curve by taking the minimum of the current
* runtime service curve and the service curve starting at (x, y).
*/
-static void
+static void
rtsc_min(rtsc, isc, x, y)
struct runtime_sc *rtsc;
struct internal_sc *isc;
@@ -1384,7 +1384,7 @@ rtsc_min(rtsc, isc, x, y)
/*
* check if (x, y1) belongs to the 1st segment of rtsc.
* if so, add the offset.
- */
+ */
if (rtsc->x + rtsc->dx > x)
dx += rtsc->x + rtsc->dx - x;
dy = seg_x2y(dx, isc->sm1);
@@ -1467,7 +1467,7 @@ hfscioctl(dev, cmd, addr, flag, p)
#endif
break;
}
-
+
switch (cmd) {
case HFSC_IF_ATTACH:
@@ -1549,13 +1549,13 @@ hfsccmd_if_attach(ap)
struct hfsc_if *hif;
struct ifnet *ifp;
int error;
-
+
if ((ifp = ifunit(ap->iface.hfsc_ifname)) == NULL)
return (ENXIO);
if ((hif = hfsc_attach(&ifp->if_snd, ap->bandwidth)) == NULL)
return (ENOMEM);
-
+
/*
* set HFSC to this ifnet structure.
*/
@@ -1576,7 +1576,7 @@ hfsccmd_if_detach(ap)
if ((hif = altq_lookup(ap->hfsc_ifname, ALTQT_HFSC)) == NULL)
return (EBADF);
-
+
if (ALTQ_IS_ENABLED(hif->hif_ifq))
altq_disable(hif->hif_ifq);
@@ -1602,11 +1602,11 @@ hfsccmd_add_class(ap)
else
return (EINVAL);
}
-
+
if ((cl = hfsc_class_create(hif, &ap->service_curve, parent,
ap->qlimit, ap->flags)) == NULL)
return (ENOMEM);
-
+
/* return a class handle to the user */
ap->class_handle = clp_to_clh(cl);
return (0);
@@ -1624,7 +1624,7 @@ hfsccmd_delete_class(ap)
if ((cl = clh_to_clp(hif, ap->class_handle)) == NULL)
return (EINVAL);
-
+
return hfsc_class_destroy(cl);
}
@@ -1696,7 +1696,7 @@ hfsccmd_class_stats(ap)
struct hfsc_class *cl;
struct hfsc_basic_class_stats stats, *usp;
int n, nclasses, error;
-
+
if ((hif = altq_lookup(ap->iface.hfsc_ifname, ALTQT_HFSC)) == NULL)
return (EBADF);
@@ -1718,7 +1718,7 @@ hfsccmd_class_stats(ap)
for (n = 0; cl != NULL && n < nclasses; cl = hfsc_nextclass(cl), n++) {
get_class_stats(&stats, cl);
-
+
if ((error = copyout((caddr_t)&stats, (caddr_t)usp++,
sizeof(stats))) != 0)
return (error);
View
8 sys/altq/altq_hfsc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_hfsc.h,v 1.5 2003/01/06 15:20:24 christos Exp $ */
+/* $NetBSD: altq_hfsc.h,v 1.5.10.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_hfsc.h,v 1.6 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -43,7 +43,7 @@
#ifdef __cplusplus
extern "C" {
-#endif
+#endif
struct hfsc_interface {
char hfsc_ifname[IFNAMSIZ]; /* interface name (e.g., fxp0) */
@@ -264,7 +264,7 @@ struct hfsc_if {
u_int hif_classes; /* # of classes in the tree */
u_int hif_packets; /* # of packets in the tree */
u_int hif_classid; /* class id sequence number */
-
+
ellist_t *hif_eligible; /* eligible list */
struct acc_classifier hif_classifier;
@@ -274,6 +274,6 @@ struct hfsc_if {
#ifdef __cplusplus
}
-#endif
+#endif
#endif /* _ALTQ_ALTQ_HFSC_H_ */
View
6 sys/altq/altq_localq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_localq.c,v 1.4 2001/11/12 23:14:22 lukem Exp $ */
+/* $NetBSD: altq_localq.c,v 1.4.24.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_localq.c,v 1.4 2001/08/16 11:28:25 kjc Exp $ */
/*
* a skeleton file for implementing a new queueing discipline.
@@ -6,7 +6,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_localq.c,v 1.4 2001/11/12 23:14:22 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_localq.c,v 1.4.24.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -59,7 +59,7 @@ localqioctl(dev, cmd, addr, flag, p)
struct proc *p;
{
int error = 0;
-
+
return error;
}
View
26 sys/altq/altq_priq.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_priq.c,v 1.7 2003/11/09 22:11:12 christos Exp $ */
+/* $NetBSD: altq_priq.c,v 1.7.8.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_priq.c,v 1.2 2001/10/26 04:56:11 kjc Exp $ */
/*
* Copyright (C) 2000
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.7 2003/11/09 22:11:12 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_priq.c,v 1.7.8.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -135,7 +135,7 @@ priq_detach(pif)
pif_list = pif->pif_next;
else {
struct priq_if *p;
-
+
for (p = pif_list; p != NULL; p = p->pif_next)
if (p->pif_next == pif) {
p->pif_next = pif->pif_next;
@@ -282,7 +282,7 @@ priq_class_create(pif, pri, qlimit, flags)
red_flags, red_pkttime);
if (cl->cl_red != NULL)
qtype(cl->cl_q) = Q_RIO;
- } else
+ } else
#endif
if (flags & PRCF_RED) {
cl->cl_red = red_alloc(0, 0, 0, 0,
@@ -359,7 +359,7 @@ priq_class_destroy(cl)
* priq_enqueue is an enqueue function to be registered to
* (*altq_enqueue) in struct ifaltq.
*/
-static int
+static int
priq_enqueue(ifq, m, pktattr)
struct ifaltq *ifq;
struct mbuf *m;
@@ -447,7 +447,7 @@ priq_addq(cl, m)
m_freem(m);
return (-1);
}
-
+
if (cl->cl_flags & PRCF_CLEARDSCP)
write_dsfield(m, cl->cl_pktattr, 0);
@@ -557,7 +557,7 @@ priqioctl(dev, cmd, addr, flag, p)
#endif
break;
}
-
+
switch (cmd) {
case PRIQ_IF_ATTACH:
@@ -638,13 +638,13 @@ priqcmd_if_attach(ap)
struct priq_if *pif;
struct ifnet *ifp;
int error;
-
+
if ((ifp = ifunit(ap->ifname)) == NULL)
return (ENXIO);
if ((pif = priq_attach(&ifp->if_snd, ap->arg)) == NULL)
return (ENOMEM);
-
+
/*
* set PRIQ to this ifnet structure.
*/
@@ -665,7 +665,7 @@ priqcmd_if_detach(ap)
if ((pif = altq_lookup(ap->ifname, ALTQT_PRIQ)) == NULL)
return (EBADF);
-
+
if (ALTQ_IS_ENABLED(pif->pif_ifq))
altq_disable(pif->pif_ifq);
@@ -691,7 +691,7 @@ priqcmd_add_class(ap)
if ((cl = priq_class_create(pif, ap->pri,
ap->qlimit, ap->flags)) == NULL)
return (ENOMEM);
-
+
/* return a class handle to the user */
ap->class_handle = clp_to_clh(cl);
return (0);
@@ -709,7 +709,7 @@ priqcmd_delete_class(ap)
if ((cl = clh_to_clp(pif, ap->class_handle)) == NULL)
return (EINVAL);
-
+
return priq_class_destroy(cl);
}
@@ -785,7 +785,7 @@ priqcmd_class_stats(ap)
struct priq_class *cl;
struct priq_basic_class_stats stats, *usp;
int pri, error;
-
+
if ((pif = altq_lookup(ap->iface.ifname, ALTQT_PRIQ)) == NULL)
return (EBADF);
View
6 sys/altq/altq_priq.h
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_priq.h,v 1.4 2003/01/06 14:09:42 christos Exp $ */
+/* $NetBSD: altq_priq.h,v 1.4.10.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_priq.h,v 1.1 2000/10/18 09:15:23 kjc Exp $ */
/*
* Copyright (C) 2000
@@ -36,7 +36,7 @@
#ifdef __cplusplus
extern "C" {
-#endif
+#endif
#define PRIQ_MAXPRI 16 /* upper limit of the number of priorities */
@@ -156,6 +156,6 @@ struct priq_if {
#ifdef __cplusplus
}
-#endif
+#endif
#endif /* _ALTQ_ALTQ_PRIQ_H_ */
View
60 sys/altq/altq_red.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_red.c,v 1.10 2004/02/13 18:02:05 wiz Exp $ */
+/* $NetBSD: altq_red.c,v 1.10.8.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_red.c,v 1.9 2002/01/07 11:25:40 kjc Exp $ */
/*
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.10 2004/02/13 18:02:05 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.10.8.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -124,7 +124,7 @@ __KERNEL_RCSID(0, "$NetBSD: altq_red.c,v 1.10 2004/02/13 18:02:05 wiz Exp $");
* linterm=30
* dropmech=drop-tail
* bytes=false (can't be handled by 32-bit fixed-point)
- * doubleq=false dqthresh=false
+ * doubleq=false dqthresh=false
* wait=true
*/
/*
@@ -275,7 +275,7 @@ redioctl(dev, cmd, addr, flag, p)
return (error);
break;
}
-
+
switch (cmd) {
case RED_ENABLE:
@@ -466,7 +466,7 @@ redioctl(dev, cmd, addr, flag, p)
default_inv_pmax = rp->inv_pmax;
} while (0);
break;
-
+
default:
error = EINVAL;
break;
@@ -517,7 +517,7 @@ red_alloc(weight, inv_pmax, th_min, th_max, flags, pkttime)
red_t *rp;
int w, i;
int npkts_per_sec;
-
+
MALLOC(rp, red_t *, sizeof(red_t), M_DEVBUF, M_WAITOK);
if (rp == NULL)
return (NULL);
@@ -548,7 +548,7 @@ red_alloc(weight, inv_pmax, th_min, th_max, flags, pkttime)
if (pkttime == 0)
/* default packet time: 1000 bytes / 10Mbps * 8 * 1000000 */
rp->red_pkttime = 800;
- else
+ else
rp->red_pkttime = pkttime;
if (weight == 0) {
@@ -574,7 +574,7 @@ red_alloc(weight, inv_pmax, th_min, th_max, flags, pkttime)
rp->red_weight, w);
rp->red_weight = w;
}
-
+
/*
* thmin_s and thmax_s are scaled versions of th_min and th_max
* to be compared with avg.
@@ -613,7 +613,7 @@ red_destroy(rp)
FREE(rp, M_DEVBUF);
}
-void
+void
red_getstats(rp, sp)
red_t *rp;
struct redstats *sp;
@@ -725,7 +725,7 @@ red_addq(rp, q, m, pktattr)
#ifdef RED_STATS
rp->red_stats.marked_packets++;
#endif
- } else {
+ } else {
/* unforced drop by red */
droptype = DTYPE_EARLY;
}
@@ -852,7 +852,7 @@ mark_ecn(m, pktattr, flags)
struct ip *ip = (struct ip *)pktattr->pattr_hdr;
u_int8_t otos;
int sum;
-
+
if (ip->ip_v != 4)
return (0); /* version mismatch! */
@@ -941,7 +941,7 @@ red_getq(rp, q)
class_queue_t *q;
{
struct mbuf *m;
-
+
if ((m = _getq(q)) == NULL) {
if (rp->red_idle == 0) {
rp->red_idle = 1;
@@ -1022,7 +1022,7 @@ wtab_alloc(weight)
return (w);
}
-int
+int
wtab_destroy(w)
struct wtab *w;
{
@@ -1043,7 +1043,7 @@ wtab_destroy(w)
return (0);
}
-int32_t
+int32_t
pow_w(w, n)
struct wtab *w;
int n;
@@ -1086,7 +1086,7 @@ pow_w(w, n)
#define FV_N 10 /* update fve_f every FV_N packets */
#define FV_BACKOFFTHRESH 1 /* backoff threshold interval in second */
-#define FV_TTHRESH 3 /* time threshold to delete fve */
+#define FV_TTHRESH 3 /* time threshold to delete fve */
#define FV_ALPHA 5 /* extra packet count */
#if (__FreeBSD_version > 300000)
@@ -1110,21 +1110,21 @@ pow_w(w, n)
#define BRTT_PMAX (1 << (FV_PSHIFT + FP_SHIFT))
const int brtt_tab[BRTT_SIZE] = {
- 0, 1262010, 877019, 703694, 598706, 525854, 471107, 427728,
- 392026, 361788, 335598, 312506, 291850, 273158, 256081, 240361,
- 225800, 212247, 199585, 187788, 178388, 169544, 161207, 153333,
- 145888, 138841, 132165, 125836, 119834, 114141, 108739, 103612,
- 98747, 94129, 89746, 85585, 81637, 77889, 74333, 70957,
- 67752, 64711, 61824, 59084, 56482, 54013, 51667, 49440,
- 47325, 45315, 43406, 41591, 39866, 38227, 36667, 35184,
- 33773, 32430, 31151, 29933, 28774, 27668, 26615, 25611,
- 24653, 23740, 22868, 22035, 21240, 20481, 19755, 19062,
- 18399, 17764, 17157, 16576, 16020, 15487, 14976, 14487,
- 14017, 13567, 13136, 12721, 12323, 11941, 11574, 11222,
- 10883, 10557, 10243, 9942, 9652, 9372, 9103, 8844,
- 8594, 8354, 8122, 7898, 7682, 7474, 7273, 7079,
- 6892, 6711, 6536, 6367, 6204, 6046, 5893, 5746,
- 5603, 5464, 5330, 5201, 5075, 4954, 4836, 4722,
+ 0, 1262010, 877019, 703694, 598706, 525854, 471107, 427728,
+ 392026, 361788, 335598, 312506, 291850, 273158, 256081, 240361,
+ 225800, 212247, 199585, 187788, 178388, 169544, 161207, 153333,
+ 145888, 138841, 132165, 125836, 119834, 114141, 108739, 103612,
+ 98747, 94129, 89746, 85585, 81637, 77889, 74333, 70957,
+ 67752, 64711, 61824, 59084, 56482, 54013, 51667, 49440,
+ 47325, 45315, 43406, 41591, 39866, 38227, 36667, 35184,
+ 33773, 32430, 31151, 29933, 28774, 27668, 26615, 25611,
+ 24653, 23740, 22868, 22035, 21240, 20481, 19755, 19062,
+ 18399, 17764, 17157, 16576, 16020, 15487, 14976, 14487,
+ 14017, 13567, 13136, 12721, 12323, 11941, 11574, 11222,
+ 10883, 10557, 10243, 9942, 9652, 9372, 9103, 8844,
+ 8594, 8354, 8122, 7898, 7682, 7474, 7273, 7079,
+ 6892, 6711, 6536, 6367, 6204, 6046, 5893, 5746,
+ 5603, 5464, 5330, 5201, 5075, 4954, 4836, 4722,
4611, 4504, 4400, 4299, 4201, 4106, 4014, 3924
};
View
4 sys/altq/altq_red.h
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_red.h,v 1.2 2000/12/14 08:49:51 thorpej Exp $ */
+/* $NetBSD: altq_red.h,v 1.2.34.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_red.h,v 1.5 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -99,7 +99,7 @@ struct redstats {
};
-/*
+/*
* IOCTLs for RED
*/
#define RED_IF_ATTACH _IOW('Q', 1, struct red_interface)
View
18 sys/altq/altq_rio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_rio.c,v 1.6 2004/02/13 18:02:05 wiz Exp $ */
+/* $NetBSD: altq_rio.c,v 1.6.8.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_rio.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.6 2004/02/13 18:02:05 wiz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.6.8.1 2005/04/29 11:27:58 kent Exp $");
#if defined(__FreeBSD__) || defined(__NetBSD__)
#include "opt_altq.h"
@@ -113,7 +113,7 @@ __KERNEL_RCSID(0, "$NetBSD: altq_rio.c,v 1.6 2004/02/13 18:02:05 wiz Exp $");
/*
* AF DS (differentiated service) codepoints.
* (classes can be mapped to CBQ or H-FSC classes.)
- *
+ *
* 0 1 2 3 4 5 6 7
* +---+---+---+---+---+---+---+---+
* | CLASS |DropPre| 0 | CU |
@@ -250,7 +250,7 @@ rioioctl(dev, cmd, addr, flag, p)
#endif
break;
}
-
+
switch (cmd) {
case RIO_ENABLE:
@@ -498,7 +498,7 @@ rio_alloc(weight, params, flags, pkttime)
rio_t *rp;
int w, i;
int npkts_per_sec;
-
+
MALLOC(rp, rio_t *, sizeof(rio_t), M_DEVBUF, M_WAITOK);
if (rp == NULL)
return (NULL);
@@ -508,7 +508,7 @@ rio_alloc(weight, params, flags, pkttime)
if (pkttime == 0)
/* default packet time: 1000 bytes / 10Mbps * 8 * 1000000 */
rp->rio_pkttime = 800;
- else
+ else
rp->rio_pkttime = pkttime;
if (weight != 0)
@@ -590,13 +590,13 @@ rio_destroy(rp)
FREE(rp, M_DEVBUF);
}
-void
+void
rio_getstats(rp, sp)
rio_t *rp;
struct redstats *sp;
{
int i;
-
+
for (i = 0; i < RIO_NDROPPREC; i++) {
(void)memcpy(sp, &rp->q_stats[i], sizeof(struct redstats));
sp->q_avg = rp->rio_precstate[i].avg >> rp->rio_wshift;
@@ -709,7 +709,7 @@ rio_addq(rp, q, m, pktattr)
prec = &rp->rio_precstate[dpindex];
avg = prec->avg;
-
+
/* see if we drop early */
droptype = DTYPE_NODROP;
if (avg >= prec->th_min_s && prec->qlen > 1) {
View
8 sys/altq/altq_rio.h
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_rio.h,v 1.2 2000/12/14 08:49:51 thorpej Exp $ */
+/* $NetBSD: altq_rio.h,v 1.2.34.1 2005/04/29 11:27:58 kent Exp $ */
/* $KAME: altq_rio.h,v 1.5 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -69,7 +69,7 @@ struct rio_conf {
#define RIOF_ECN (RIOF_ECN4 | RIOF_ECN6)
#define RIOF_CLEARDSCP 0x200 /* clear diffserv codepoint */
-/*
+/*
* IOCTLs for RIO
*/
#define RIO_IF_ATTACH _IOW('Q', 1, struct rio_interface)
@@ -103,7 +103,7 @@ typedef struct rio {
int old; /* avg is above th_min */
struct timeval last; /* timestamp when queue becomes idle */
} rio_precstate[RIO_NDROPPREC];
-
+
int rio_wshift; /* log(red_weight) */
int rio_weight; /* weight for EWMA */
struct wtab *rio_wtab; /* weight table */
@@ -114,7 +114,7 @@ typedef struct rio {
u_int8_t rio_codepoint; /* codepoint value to tag packets */
u_int8_t rio_codepointmask; /* codepoint mask bits */