118661 Commits

Author SHA1 Message Date
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
ceri
bc3c1b31ae MFC revision 1.10:
Another update for reality: "dangerously dedicated" mode is
  now achieved by hitting 'F', which is no longer undocumented.

Approved by:	re (scottl)
2006-02-13 21:03:55 +00:00
ceri
4285305817 MFC revision 1.414:
Correct a user-visible typo.

Approved by:	re (scottl)
2006-02-13 21:02:35 +00:00
ceri
b86b7b2ee0 MFC the following revisions of the help files:
Bring these files somewhat into the present.
  Perform some rewording while here.

  Remove register.hlp, since the code that deals with it was removed
  nearly 7 years ago.

  Revision  Changes    Path
  1.2       +2 -0      src/usr.sbin/sysinstall/help/anonftp.hlp
  1.15      +9 -10     src/usr.sbin/sysinstall/help/distributions.hlp
  1.5       +1 -5      src/usr.sbin/sysinstall/help/fixit.hlp
  1.3       +1 -1      src/usr.sbin/sysinstall/help/html.hlp
  1.9       +75 -18    src/usr.sbin/sysinstall/help/options.hlp
  1.14      +2 -2      src/usr.sbin/sysinstall/help/partition.hlp
  1.6       +0 -76     src/usr.sbin/sysinstall/help/register.hlp (dead)
  1.3       +2 -2      src/usr.sbin/sysinstall/help/securelevel.hlp
  1.12      +15 -12    src/usr.sbin/sysinstall/help/shortcuts.hlp
  1.9       +1 -7      src/usr.sbin/sysinstall/help/slice.hlp
  1.10      +10 -2     src/usr.sbin/sysinstall/help/tcp.hlp
  1.7       +5 -5      src/usr.sbin/sysinstall/help/usermgmt.hlp

Approved by:	re (scottl)
2006-02-13 21:01:23 +00:00
marius
aa6cc742fc MFC: 1.2
Add a reference to le(4) as the SBus-based Ultra 1 have on-board LANCE.

Approved by:	re (scottl)
2006-02-13 11:47:47 +00:00
marius
7f97c07671 MFC: 1.29
Add le(4) to the list of devices supporting VLAN-sized frames natively.

Approved by:	re (scottl)
2006-02-13 11:46:51 +00:00
marius
f7e21cec3c MFC: share/man/man4/Makefile 1.337, src/share/man/man4/le.4 1.2
Add a man page for le(4).

Approved by:	re (scottl)
2006-02-13 11:45:21 +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
marius
100fc73647 MFC: 1.15
- Sync the list of supported chips with pcn_probe() as of sys/pci/if_pcn.c
  rev. 1.77 (also applies to RELENG_6), i.e. remove Am53C974/Am79C970/
  Am79C974 PCnet-PCI and Am79C970A PCnet-PCI II.
- Change the entry of the PCnet-Home in the list of supported chips to
  match the other ones, i.e. s,PCnet/Home HomePNA,Am79C978 PCnet-Home,.
- s,familly,family

Approved by:	re (scottl)
2006-02-12 22:20:09 +00:00
flz
fadeb41ea3 MFC:
- Add a startup script for hostapd.
  - Document associated variable in rc.conf(5).

      src/etc/rc.d/Makefile: rev 1.64 -> 1.65
      src/share/man/man5/rc.conf.5: rev 1.283 -> 1.284
      src/etc/rc.d/hostapd: rev 0 -> 1.1
      src/etc/defaults/rc.conf: rev 1.273 -> 1.274

Approved by:	re (hrs)
2006-02-12 22:13:16 +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
delphij
f865c8d9db MFC a set of changes that fixes DHCP handling in sysinstall(8)
* network.c,v 1.53 (by ceri):
   Fixes DHCP handling to use a more robust way to determine whether
   DHCP should be used.
 * tcpip.c,v 1.134:
   Avoid adding unnecessary tailing space when no media option(s) is
   specified.

Approved by:	re (scottl)
2006-02-12 15:23:50 +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
marcel
848bf6d236 MFC:
src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml:1.295
	src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml:1.10
	src/release/doc/share/misc/dev.archlist.txt:1.77

Approved by: re (hrs; thanks!)
2006-02-11 18:54:19 +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
marcel
d92c912d8a MFC rev. 1.6, 1.7: Add HARDWARE section.
Approved by: re (hrs)
2006-02-11 06:30:41 +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
yar
af897e152b MFC ifconfig.c rev. 1.117:
Do address assignment/removal operations after callbacks.  Presently,
ifconfig callbacks are used for L2 configuration, media and vlan,
so actions associated with address assignment, like sending out a
gratuitous ARP, should go when L2 is running already.

Return ifvlan.c to the state of rev. 1.7.2.2 -- undo the last
back-out.  The above change to ifconfig.c lets us use a callback
for vlan set-up without facing the evil side-effects from IP
assignment to an orphaned vlan interface.

Approved by:	re (scottl)
2006-02-09 10:48:43 +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
mjacob
975a64fd91 MFC 1.21: update man page for boot stuff plus remove some cards described.
Approved by:	re
2006-02-07 22:01:59 +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
ru
a5e5f01dae MFC: 1.3: RELENG_6_* commit constraints.
Approved by:	re (kensmith)
2006-02-06 16:39:06 +00:00
bmah
42182536cd Fix misspelling: s/Janurary/January/
Approved by:	re (scottl)
2006-02-05 20:45:04 +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
trhodes
4969a1e922 MFC:
Work around an mdoc bug.

Actually MFC the enhanced SYNOPSIS section, wasn't a real bug according
to ru.

Requested/reminded by:  marius
Approved by:            re (scottl)
2006-02-02 07:50:02 +00:00
brueffer
2f753f8970 MFC: rev. 1.62
Document JMicron JMB360.

Approved by:	re (scottl)
2006-02-02 06:06:27 +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
stefanf
ce5ae18e82 Unbreak building RELENG_6 on RELENG_5 by providing a __format_arg macro if
it's not defined in <sys/cdefs.h>.  This situation happens early when building
the bootstrap-tools, where the new <nl_types.h> is mixed with the old
<sys/cdefs.h>.

Submitted by:	imp
Reviewed by:	ru
2006-02-01 12:24:39 +00:00
nyan
f08720b58a MFC: Remove unsupported hardware. 2006-02-01 11:12:34 +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