55819 Commits

Author SHA1 Message Date
rwatson
f6557302f2 Merge if_ef.c:1.38 from HEAD to RELENG_6:
Check the right ifnet pointer to see if if_alloc() failed or not in
  ef_clone(); we were testing the original ifnet, not the one allocated.

  When aborting ef_clone() due to if_alloc() failing, free the allocated
  efnet structure rather than leaking it.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 21:11:19 +00:00
rwatson
bcc6ac0035 Merge if_ef.c:1.37 from HEAD to RELENG_6:
When freeing the chain of if_ef devices on an aborted load, use
  SLIST_FOREACH_SAFE() rather than SLIST_FOREACH(), as elements are
  freed on each iteration of the loop.  This prevents use-after-free.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 21:09:46 +00:00
brooks
577b28fda2 MFC syscons.c rev 1.441 and documentation:
When SC_DISABLE_KDBKEY or SC_DISABLE_REBOOT are not defined allow the
same behavior to be controlled by the sysctls, hw.syscons.kbd_kbdkey
and hw.syscons.kbd_reboot respectively.

PR:		kern/72728
Submitted by:	Luca Morettoni <morettoni at libero dot it>
Approved by:	re (scottl)
2006-02-14 16:41:27 +00:00
ume
6e7d681477 MFC 1.63: avoided the use of purged address structure when an
address became invalid in nd6_timer().

Approved by:	re (hrs)
2006-02-14 16:29:22 +00:00
luigi
31eed14fe7 MFC: make sure the start and end markers are contiguous and
not suppressed by the optimizer.

Approved by: re
2006-02-14 14:46:22 +00:00
ps
0f5fcc3599 MFC: rev 1.33
Enable 64bit SGL's on PERC 4/DC

Approved by:	re
2006-02-14 08:05:29 +00:00
ps
6875ea6a2c MFC: amr.c 1.75, amrvar.h 1.30
- Move the command setup from amr_start1 into the card specific submit
  routines.
- Add or replace cpu_spinwait() with DELAY(1) to a few of the busy
  loops when reading from the controller to work around firmware bugs
  which can crash the controller.

Approved by:	re
2006-02-14 08:04:39 +00:00
ru
7b02bd77cd MFC: 1.36: Fix output byte and error counting.
Approved by:	re (scottl)
2006-02-14 06:21:47 +00:00
ru
2d53485ac9 MFC:
- Add loader(8) variables for RB_DFLTROOT, RB_MUTE, and RB_PAUSE:
  "boot_dfltroot", "boot_mute", and "boot_pause" respectively.

- Cause all flags passed by boot2 to set the respective loader(8)
  boot_* variable.  The end effect is that all flags from boot2
  are now passed to the kernel.

Approved by:	re (scottl)
2006-02-14 06:20:16 +00:00
marcel
ae752767c9 MFC fixes for MCA MPSAFEness:
mca.c:1.11
	mp_machdep.c:1.60

Approved by: re (scottl, thanks!)
2006-02-14 03:40:49 +00:00
rwatson
67ad5e7105 Merge uma_core.c:1.136 from HEAD to RELENG_6:
Skip per-cpu caches associated with absent CPUs when generating a
  memory statistics record stream via sysctl.

Approved by:	re (scottl)
2006-02-14 03:37:58 +00:00
rwatson
b765ebeb75 Merge subr_disk.c:1.86 from HEAD to RELENG_6:
When calling bioq_first() to see if a queue is empty in bioq_disksort(),
  don't save the return value as we won't use it.

  Noticed by:     Coverity Prevent analysis tool

Approved by:	re (scottl)
2006-02-14 03:29:31 +00:00
rwatson
f017c618f0 Merge nfs_lock.c:1.43 from HEAD to RELENG_6:
In nfs_dolock(), GC now under-used ioflg, rendered obsolete when we moved
  from using a fifo to talk to rpc.lockd to using a special device node.

Approved by:	re (scottl)
2006-02-14 00:06:32 +00:00
rwatson
bfd457b328 Merge vnode.h:1.312 from HEAD to RELENG_6:
Rename uid and gid arguments to vaccess() prototype to match vaccess()
  implementation in vfs_subr.c.  No functional change.

Approved by:	re (scottl)
2006-02-14 00:03:00 +00:00
rwatson
48d1eb882f Merge kern_ktrace.c:1.103, ktrace.h:1.31 from HEAD to RELENG_6:
Reuse ktr_unused field in ktr_header structure as ktr_tid; populate
  ktr_tid as part of gathering of ktr header data for new ktrace
  records.  The continued use of intptr_t is required for file layout
  reasons, and cannot be changed to lwpid_t at this point.

  Reviewed by:    davidxu

Approved by:	re (scottl)
2006-02-14 00:02:01 +00:00
rwatson
0a7e5efc42 Merge atm_signal.c:1.14 from HEAD to RELENG_6:
Convert function declarations to ANSI C.

Approved by:	re (scottl)
2006-02-13 23:54:48 +00:00
rwatson
c38e03130c Merge fnmatch.c:1.20 from HEAD to RELENG_6:
Convert function declarations to ANSI C.

Approved by:	re (scottl)
2006-02-13 23:52:29 +00:00
rwatson
24a7189e9d Merge uipc_sem.c:1.22 from HEAD to RELENG_6:
Convert remaining functions to ANSI C function declarations.

Approved by:	re (scottl)
2006-02-13 23:51:19 +00:00
rwatson
5db3947c25 Merge Makefile:1.4 from HEAD to RELENG_6:
Correct help line: list targets, not names of files generated by targets
  when no argument is provided to make.

Approved by:	re (scottl)
2006-02-13 23:48:26 +00:00
rwatson
25bf323777 Merge ip_input.c:1.311 from HEAD to RELENG_6:
Modify the IP fragment reassembly code so that it uses a new UMA zone,
  ipq_zone, to allocate fragment headers from, rather than using cast mbuf
  storage.  This was one of the few remaining uses of mbuf storage for
  local data structures that relied on dtom().  Implement the resource
  limit on ipq's using UMA zone limits, but preserve current sysctl
  semantics using a sysctl proc.

Approved by:	re (scottl)
2006-02-13 23:46:31 +00:00
rwatson
f55041bfd1 MFC ip_input.c:1.310:
Staticize ipqlock, since it is local to ip_input.c.

Approved by:	re (scottl)
2006-02-13 23:44:20 +00:00
marius
05e831efa6 MFC: sys/conf/NOTES 1.1349, sys/conf/files 1.1090,
sys/conf/files.sparc64 1.78, sys/modules/Makefile 1.471,
     sys/modules/le/Makefile 1.1, sys/sparc64/conf/GENERIC 1.105

Hook up le(4) to the build.

Approved by:	re (scottl)
2006-02-13 11:39:02 +00:00
marius
6ab8768830 MFC: sys/dev/le/am7990.c 1.1, sys/dev/le/am79900.c 1.1,
sys/dev/le/am79900reg.h 1.1, sys/dev/le/am79900var.h 1.1,
     sys/dev/le/am7990reg.h 1.1, sys/dev/le/am7990var.h 1.1,
     sys/dev/le/if_le_ledma.c 1.1, sys/dev/le/if_le_pci.c 1.1,
     sys/dev/le/lance.c 1.1, sys/dev/le/lancereg.h 1.1,
     sys/dev/le/lancevar.h 1.1

Add le(4), a driver for AMD Am7900 LANCE and Am79C9xx PCnet NICs,
ported from NetBSD.
This version differs from HEAD in that if_le_ledma.c inlines
lsi64854_enet_intr() from rev. 1.8 of sys/sparc64/sbus/lsi64854.c
in le_dma_hwintr() in order to not break the API of the LSI64854
driver in RELENG_6.

Approved by:	re (scottl)
2006-02-13 11:30:40 +00:00
marius
5e734a4bf4 MFC: 1.17
- Don't shift the clock frequency in MHz left by 8 before assigning it
  to sbus_mdvec.dv_clock as sbus_mdvec.dv_clock is meant to be specified
  in MHz. While this was a bug it shouldn't have affected FreeBSD/sparc64
  as sbus_mdvec.dv_clock is used to limit the clock rate of chips when
  a machine isn't able to support them at maximum speed which isn't the
  case for sun4u machines.
- Remove the code that checks whether the clock frequency returned by
  sbus_get_clockfreq() is 0 and falls back to 25MHz if it is as that's
  already done in sbus(4).

Approved by:	re (scottl)
2006-02-12 22:57:04 +00:00
sam
1d09453a57 pad embedded structs so we can preserve abi's moving forward
Reviewed by:	scottl, dwhite, kensmith, avatar
Approved by:	re
2006-02-12 19:00:39 +00:00
yar
da071e483e MFC rev. 1.95:
Set IFF_BROADCAST and IFF_MULTICAST on vlan interfaces from the
  beginning and simply refuse to attach to a parent without either
  flag.  Our network stack doesn't like those flags changing and
  there is no need in them doing so.

Approved by:	re (scottl)
2006-02-12 12:19:06 +00:00
ume
938d160249 MFC 1.168: Never select the PCB that has INP_IPV6 flag and is bound
to :: if we have another PCB which is bound to 0.0.0.0.  If a PCB has
the INP_IPV6 flag, then we set its cost higher than IPv4 only PCBs.

Approved by:	re (scottl)
2006-02-11 09:02:59 +00:00
brueffer
72689fc263 MFC: rev. 1.18
Clean up some sysctl descriptions, debug messages etc.

Approved by:	re (scottl)
2006-02-11 08:25:22 +00:00
ume
69d4324002 MFC: obey opt_inet6.h and opt_ipsec.h in kernel build directory.
src/sys/modules/ipfw/Makefile:	1.22, 1.23
	src/sys/netinet/ip_fw2.c:	1.117
	src/sys/netinet/ip_fw_pfil.c:	1.20

Approved by:	re (scottl)
2006-02-11 08:19:37 +00:00
imp
9b115c7d4d MFC: add cardbus_device.c. This file was left out when the rest of the
changes were merged, resulting in load errors at boot time.

Approved by: re@ (scottl)
2006-02-11 06:55:50 +00:00
yar
25d6e2cc4f MFC:
Avoid creating (and subsequently using) fake opt_*.h files
when the modules are built with the kernel and hence actual
opt_*.h files are available in ${KERNBUILDDIR}.  Fix a few
small bugs that would prevent this from working.

At last the build options of the modules become consistent
with those of the kernel unless the MODULES_WITH_WORLD way
still is used.

Approved by:	re (kensmith, scottl)
Requested by:	ru
Tested on:	amd64 i386 sparc64
Tested by:	md5
2006-02-10 00:38:08 +00:00
ru
cc436d7bbf MFC: 1.35: Fix interface output queue handling.
Approved by:	re (scottl)
2006-02-09 16:59:37 +00:00
ume
64eea879fa MFC 1.56: make IPV6_V6ONLY socket option work for UDP as well.
Approved by:	re (scottl)
2006-02-09 02:33:14 +00:00
ru
a598a0b072 MFC: 1.97: axe unused function, 1.98: fix locking.
Approved by:	re (scottl)
2006-02-08 16:22:45 +00:00
ru
a6e0606001 MFC: Bump copyright year.
Approved by:	re (scottl)
2006-02-08 09:11:58 +00:00
ps
560c889530 MFC:
Remove GIANT from device random.

Approved by:	re (scottl)
2006-02-08 05:58:17 +00:00
davidxu
7bd3a09a50 MFC amd64/amd64/machdep.c revision 1.646, i386/i386/machdep.c
revision 1.622
>
> Clear carry flag in get_mcontext so that setcontext does not
> return a bogus error.
>
> PR: misc/92110

Approved by:	re (scottl)
2006-02-07 00:29:33 +00:00
netchild
e7e9bb50b6 MFC rev 1.79 and 1.80:
Allow to use more than 7 buttons (31 in case you don't want to look
  at the code) with USB mice.

Requested by:	Seán C. Farley <sean-freebsd@farley.org>
Approved by:	re (kensmith)
2006-02-06 20:29:17 +00:00
oleg
d381d868b6 MFC 1.120:
1) Fix link state detection for cards operating in TBI mode (fiber ones)
2) add missing bus_dmamap_sync() call in bge_intr()

Approved by:	re (scottl)
2006-02-05 18:07:15 +00:00
mjacob
fcfd54426b MFC overflow bug fixes and disable ISP_DAC_SUPPORTED for now
Approved by: re
2006-02-04 23:53:08 +00:00
netchild
f8325a658c MFC
- rev 1.31 of maestro.c
 - rev 1.93 of dsp.c

Both fix potential NULL pointer dereferencing.

Found with:	Coverity Prevent(tm)
Approved by:	re (kensmith)
2006-02-04 11:58:28 +00:00
sam
3d8ebe26d4 add DEFAULTS and remove entries in GENERIC now duplicated
Approved by:	re (scottl)
2006-02-03 23:37:21 +00:00
ru
610b3e366d MFC: 1.119: Make sure we reprogram multicast filter on IFF_ALLMULTI.
Approved by:	re (kensmith)
2006-02-03 15:56:42 +00:00
ru
0964959703 MFC: 1.25, 1.26: Fix multicast routing on 64-bit platforms.
Approved by:	re (kensmith)
2006-02-03 15:51:17 +00:00
scottl
4aa6274b4c MFC: Move inlined functions into a library.
Approved by: re
2006-02-03 14:43:57 +00:00
thompsa
7a8d8adc25 MFC r1.150, do not send two ARP replies if the bridge has an address.
Approved by:	re (scottl)
2006-02-03 08:07:42 +00:00
thompsa
3a707b5728 MFC r1.52, fix inconsistencies with the bridge route table.
Approved by:	re (scottl)
2006-02-03 08:06:11 +00:00
cvs2svn
de143a5b92 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-02-03 01:35:37 +00:00
kensmith
764cb1fdfc Note that we've entered code freeze and the 6.1-RELEASE cycle has
begun but we're not ready to branch yet so we call it PRERELEASE
between now and when we're ready to branch.

Approved by:	re (implicit)
2006-02-01 18:04:43 +00:00
rik
4908bf7b86 MFC: -j 1.9 -j 1.10
----------------------------
	revision 1.10
	date: 2006/01/29 22:06:51;  author: rik;  state: Exp;  lines: +1 -0
	Fix module from panic.
	Pointy hat:	brooks
	MFC after:	3 days
2006-02-01 04:50:07 +00:00