fake:

20 years ago · a6b971a676
26 changed files with 0 additions and 2112 deletions
--- a/package/powerpc/linux24benh-header/linux24benh-header.cache
+++ b/package/powerpc/linux24benh-header/linux24benh-header.cache
@ -1,34 +0,0 @@
 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/powerpc/linux24benh-header/linux24benh-header.cache
 [COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [TIMESTAMP] 1052205856 Tue May  6 09:24:16 2003
 [CONFIG-ID] 1.7-snapshot-x86-reference
 [ROCKVER] 1.7-snapshot

 [LOGS] 1-linux24-src.log 5-linux24-src.log 9-linux24-src.log

 [BUILDTIME] 5719 (9)
 [SIZE] 156.46 MB, 11894 files

 [DEP] bash binutils bzip2 coreutils findutils gcc3 glibc23 grep
 [DEP] linux24-header linux24-src m4 make patch sed sysfiles tar

--- a/package/powerpc/linux24benh-header/linux24benh-header.conf
+++ b/package/powerpc/linux24benh-header/linux24benh-header.conf
@ -1,25 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh-header/linux24benh-header.conf
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 # simply do the same as the linux24-header package
 . $base/package/base/linux24-header/linux24-header.conf

--- a/package/powerpc/linux24benh-header/linux24benh-header.desc
+++ b/package/powerpc/linux24benh-header/linux24benh-header.desc
@ -1,49 +0,0 @@

 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/powerpc/linux24benh-header/linux24benh-header.desc
 [COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [I] The Linux kernel headers

 [T] This package includes the linux kernel headers (include files)
 [T] needed to compile applications.
 [T] The files resist in /usr/include/{asm,asm-generic,linux}.
 
 [U] http://www.kernel.org/

 [A] Linus Toralds <torvalds@transmeta.com>
 [M] Clifford Wolf <clifford@clifford.at>
 [M] Rene Rebe <rene@rocklinux.org>

 [C] base/kernel
 [F] DIETLIBC

 [E] group kernel-src

 [O] vanilla_ver="2.4.25"
 [O] var_append patchfiles " " "patch-2.4.25-ben1-rxr.bz2"

 [L] GPL
 [S] Stable
 [V] 2.4.25-benh1-rxr
 [P] X 01-------9 100.500
 [R] + powerpc

--- a/package/powerpc/linux24benh-src/linux24benh-src.cache
+++ b/package/powerpc/linux24benh-src/linux24benh-src.cache
@ -1,34 +0,0 @@
 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/powerpc/linux24benh-src/linux24benh-src.cache
 [COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [TIMESTAMP] 1052205856 Tue May  6 09:24:16 2003
 [CONFIG-ID] 1.7-snapshot-x86-reference
 [ROCKVER] 1.7-snapshot

 [LOGS] 1-linux24-src.log 5-linux24-src.log 9-linux24-src.log

 [BUILDTIME] 5719 (9)
 [SIZE] 156.46 MB, 11894 files

 [DEP] bash binutils bzip2 coreutils findutils gcc3 glibc23 grep
 [DEP] linux24-header linux24-src m4 make patch sed sysfiles tar

--- a/package/powerpc/linux24benh-src/linux24benh-src.conf
+++ b/package/powerpc/linux24benh-src/linux24benh-src.conf
@ -1,25 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh-src/linux24benh-src.conf
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 # simply do the same as the linux24-src package
 . $base/package/base/linux24-src/linux24-src.conf

--- a/package/powerpc/linux24benh-src/linux24benh-src.desc
+++ b/package/powerpc/linux24benh-src/linux24benh-src.desc
@ -1,49 +0,0 @@

 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/powerpc/linux24benh-src/linux24benh-src.desc
 [COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [I] The Linux kernel sources

 [T] The upatched tar file and the patches used in ROCK Linux can be found
 [T] at '/usr/src/kernel/' - the extraced and patched kernel can be found
 [T] at '/usr/src/linux/'.

 [U] http://www.kernel.org/

 [A] Linus Toralds <torvalds@transmeta.com>
 [M] Clifford Wolf <clifford@clifford.at>
 [M] Rene Rebe <rene@rocklinux.org>

 [C] base/kernel
 [F] DIETLIBC

 [E] group kernel-src

 [O] vanilla_ver="2.4.25"
 [O] var_append patchfiles " " "patch-2.4.25-ben1-rxr.bz2"

 [L] GPL
 [S] Stable
 [V] 2.4.25-benh1-rxr
 [P] X -1---5---9 100.800
 [R] + powerpc

--- a/package/powerpc/linux24benh/05-devfs-not-exp.patch
+++ b/package/powerpc/linux24benh/05-devfs-not-exp.patch
@ -1,42 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/05-devfs-not-exp.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 Currently (at version 2.0.x) ROCK Linux required DevFS. It is highly
 useful. Later version of ROCK Linux are planed to support other variants
 (like old-style device nodes or udevfs).

  - Rene Rebe <rene@rocklinux.org>

 --- linux-2.4.23/fs/Config.in.orig	2003-11-28 19:26:21.000000000 +0100
 +++ linux-2.4.23/fs/Config.in	2003-12-09 00:55:11.000000000 +0100
@@ -72,13 +72,9 @@
 
 bool '/proc file system support' CONFIG_PROC_FS
 
 -# For some reason devfs corrupts memory badly on x86-64. Disable it 
 -# for now.
 -if [ "$CONFIG_X86_64" != "y" ] ; then
 -dep_bool '/dev file system support (EXPERIMENTAL)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL
 +dep_bool '/dev file system support (Required for ROCK Linux)' CONFIG_DEVFS_FS $CONFIG_EXPERIMENTAL
 dep_bool '  Automatically mount at boot' CONFIG_DEVFS_MOUNT $CONFIG_DEVFS_FS
 dep_bool '  Debug devfs' CONFIG_DEVFS_DEBUG $CONFIG_DEVFS_FS
 -fi
 
 # It compiles as a module for testing only.  It should not be used
 # as a module in general.  If we make this "tristate", a bunch of people
--- a/package/powerpc/linux24benh/06-devfs-default.patch
+++ b/package/powerpc/linux24benh/06-devfs-default.patch
@ -1,186 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/06-devfs-default.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./arch/i386/defconfig.orig	2002-08-03 02:39:42.000000000 +0200
 +++ ./arch/i386/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -668,8 +668,8 @@
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/alpha/defconfig.orig	2001-11-20 00:19:42.000000000 +0100
 +++ ./arch/alpha/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -567,8 +567,8 @@
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/sparc/defconfig.orig	2002-08-03 02:39:43.000000000 +0200
 +++ ./arch/sparc/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -311,8 +311,8 @@
 # CONFIG_NTFS_RW is not set
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/mips/defconfig.orig	2002-08-03 02:39:43.000000000 +0200
 +++ ./arch/mips/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -491,8 +491,8 @@
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/ppc/defconfig.orig	2002-02-25 20:37:55.000000000 +0100
 +++ ./arch/ppc/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -728,7 +728,7 @@
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 CONFIG_DEVFS_FS=y
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/m68k/defconfig.orig	2000-06-19 21:56:08.000000000 +0200
 +++ ./arch/m68k/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -230,8 +230,8 @@
 # CONFIG_NTFS_FS is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/sparc64/defconfig.orig	2002-08-03 02:39:43.000000000 +0200
 +++ ./arch/sparc64/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -623,8 +623,8 @@
 # CONFIG_NTFS_RW is not set
 CONFIG_HPFS_FS=m
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/arm/defconfig.orig	2001-05-20 02:43:05.000000000 +0200
 +++ ./arch/arm/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -423,8 +423,8 @@
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/sh/defconfig.orig	2001-10-15 22:36:48.000000000 +0200
 +++ ./arch/sh/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -168,8 +168,8 @@
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 # CONFIG_DEVPTS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/ia64/defconfig.orig	2002-08-03 02:39:42.000000000 +0200
 +++ ./arch/ia64/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -617,8 +617,8 @@
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/mips64/defconfig.orig	2002-08-03 02:39:43.000000000 +0200
 +++ ./arch/mips64/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -434,8 +434,8 @@
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 CONFIG_DEVPTS_FS=y
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/parisc/defconfig.orig	2000-12-05 21:29:39.000000000 +0100
 +++ ./arch/parisc/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -296,8 +296,8 @@
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 # CONFIG_DEVPTS_FS is not set
 # CONFIG_QNX4FS_FS is not set
 --- ./arch/cris/defconfig.orig	2002-08-03 02:39:42.000000000 +0200
 +++ ./arch/cris/defconfig	2002-08-06 07:26:16.000000000 +0200
@@ -454,8 +454,8 @@
 # CONFIG_NTFS_RW is not set
 # CONFIG_HPFS_FS is not set
 CONFIG_PROC_FS=y
 -# CONFIG_DEVFS_FS is not set
 -# CONFIG_DEVFS_MOUNT is not set
 +CONFIG_DEVFS_FS=y
 +CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVFS_DEBUG is not set
 # CONFIG_DEVPTS_FS is not set
 # CONFIG_QNX4FS_FS is not set
--- a/package/powerpc/linux24benh/08-nomodinst_post_pcmcia.patch
+++ b/package/powerpc/linux24benh/08-nomodinst_post_pcmcia.patch
@ -1,30 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/08-nomodinst_post_pcmcia.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./Makefile.orig	2003-01-18 12:05:03.000000000 +0100
 +++ ./Makefile	2003-01-18 12:05:06.000000000 +0100
@@ -418,7 +418,7 @@
 depmod_opts	:= -b $(INSTALL_MOD_PATH) -r
 endif
 .PHONY: _modinst_post
 -_modinst_post: _modinst_post_pcmcia
 +_modinst_post:
 	if [ -r System.map ]; then $(DEPMOD) -ae -F System.map $(depmod_opts) $(KERNELRELEASE); fi
 
 # Backwards compatibilty symlinks for people still using old versions
--- a/package/powerpc/linux24benh/12-conf-hacks.patch
+++ b/package/powerpc/linux24benh/12-conf-hacks.patch
@ -1,128 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/12-conf-hacks.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./scripts/Configure.orig	2003-01-13 23:24:50.000000000 +0100
 +++ ./scripts/Configure	2003-01-13 23:24:54.000000000 +0100
@@ -49,6 +49,8 @@
 # 24 January 1999, Michael Elizabeth Chastain, <mec@shout.net>
 # - Improve the exit message (Jeff Ronne).
 
 +# 20-06-1999: Added ALL_MODS_HACK and NEVER_ASK_HACK - Clifford
 +# 01-05-2001: Improved ALL_MODS_HACK - Rene 
 #
 # Make sure we're really running bash.
 #
@@ -184,6 +186,7 @@
 	      ;;
 	esac
 	while :; do
 +	  [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def"
 	  readln "$1 ($2) [$defprompt] " "$def" "$old"
 	  case "$ans" in
 	    [yY] | [yY]es ) define_bool "$2" "y"
@@ -216,6 +219,10 @@
 		;;
 	  esac
 	  while :; do
 +	    if [ ".$ALL_MODS_HACK" = .1 -a ".$def" != .y ] ; then
 +	      old=m ; def=m
 +	    fi
 +	    [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def"
 	    readln "$1 ($2) [$defprompt] " "$def" "$old"
 	    case "$ans" in
 	      [yY] | [yY]es ) define_tristate "$2" "y"
@@ -271,6 +278,10 @@
 		      ;;
 		esac
 		while :; do
 +		  if [ ".$ALL_MODS_HACK" = .1 ] ; then
 +		    old=m ; def=m
 +		  fi
 +		  [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def"
 		  readln "$ques ($var) [$defprompt] " "$def" "$old"
 		  case "$ans" in
 		      [nN] | [nN]o )  define_tristate "$var" "n"
@@ -359,6 +370,8 @@
 	  max=10000000     # !!
 	fi
 	while :; do
 +	  [ -z "$def" -a ".$NEVER_ASK_HACK" = .1 ] && def="0"
 +	  [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def"
 	  readln "$1 ($2) [$def] " "$def" "$old"
 	  if expr \( \( $ans + 0 \) \>= $min \) \& \( $ans \<= $max \) >/dev/null 2>&1 ; then
             define_int "$2" "$ans"
@@ -390,6 +403,8 @@
 	def=${old:-$3}
 	def=${def#*[x,X]}
 	while :; do
 +	  [ -z "$def" -a ".$NEVER_ASK_HACK" = .1 ] && def="0"
 +	  [ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def"
 	  readln "$1 ($2) [$def] " "$def" "$old"
 	  ans=${ans#*[x,X]}
 	  if expr "$ans" : '[0-9a-fA-F][0-9a-fA-F]*$' > /dev/null; then
@@ -420,6 +435,8 @@
 function string () {
 	old=$(eval echo "\${$2}")
 	def=${old:-$3}
 +	[ -z "$def" -a ".$NEVER_ASK_HACK" = .1 ] && def="-"
 +	[ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def"
 	while :; do
           if [ "$old" = "?" ]; then
              readln "$1 ($2) [$def] " "$def" ""
@@ -474,6 +491,7 @@
 	val=""
 	while [ -z "$val" ]; do
 		ambg=n
 +		[ -z "$old" -a ".$NEVER_ASK_HACK" = .1 ] && old="$def"
 		readln "$question ($names) [$def] " "$def" "$old"
 		ans=$(echo $ans | tr a-z A-Z)
 		set -- $choices
@@ -534,11 +552,19 @@
 echo "#define AUTOCONF_INCLUDED" >> $CONFIG_H
 
 DEFAULT=""
 -if [ "$1" = "-d" ] ; then
 +ALL_MODS_HACK="0"
 +NEVER_ASK_HACK="0"
 +
 +if [ "$1" = "-d" -o "$1" = "-D" -o "$1" = "-m" -o "$1" = "-M" ] ; then
 +	[ "$1" = "-D" -o "$1" = "-M" ] && NEVER_ASK_HACK="1"
 +	[ "$1" = "-m" -o "$1" = "-M" ] && ALL_MODS_HACK="1"
 	DEFAULT="-d"
 	shift
 fi
 
 +[ $NEVER_ASK_HACK = 1 ] && echo "Debug: NEVER_ASK_HACK active."
 +[ $ALL_MODS_HACK = 1 ] && echo "Debug: ALL_MODS_HACK active."
 +
 CONFIG_IN=./config.in
 if [ "$1" != "" ] ; then
 	CONFIG_IN=$1
 --- ./Makefile.orig	2003-01-13 23:24:57.000000000 +0100
 +++ ./Makefile	2003-01-13 23:25:56.000000000 +0100
@@ -301,6 +301,9 @@
 oldconfig: symlinks
 	$(CONFIG_SHELL) scripts/Configure -d arch/$(ARCH)/config.in
 
 +no2modconfig: symlinks
 +	$(CONFIG_SHELL) scripts/Configure -m arch/$(ARCH)/config.in
 +
 xconfig: symlinks
 	$(MAKE) -C scripts kconfig.tk
 	wish -f scripts/kconfig.tk
--- a/package/powerpc/linux24benh/15-install-in-boot.patch
+++ b/package/powerpc/linux24benh/15-install-in-boot.patch
@ -1,35 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/15-install-in-boot.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---


 This Patch is specific to ROCK Linux and not available as stand-alone patch.

 - Clifford Wolf <god@clifford.at>

 --- linux/Makefile
 +++ linux/Makefile
@@ -70,7 +70,7 @@
 # images.  Uncomment if you want to place them anywhere other than root.
 #
 
 -#export	INSTALL_PATH=/boot
 +export	INSTALL_PATH=/boot
 
 #
 # INSTALL_MOD_PATH specifies a prefix to MODLIB for module directory
--- a/package/powerpc/linux24benh/20-kernel-cc.patch
+++ b/package/powerpc/linux24benh/20-kernel-cc.patch
@ -1,37 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/20-kernel-cc.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---


 This Patch is specific to ROCK Linux and not available as stand-alone patch.

 - Clifford Wolf <god@clifford.at>

 --- linux/Makefile
 +++ linux/Makefile
@@ -27,7 +27,9 @@
 
 AS		= $(CROSS_COMPILE)as
 LD		= $(CROSS_COMPILE)ld
 -CC		= $(CROSS_COMPILE)gcc
 +KCC		= $(CROSS_COMPILE)kcc
 +GCC		= $(CROSS_COMPILE)gcc
 +CC		= $(if $(shell sh -c 'type -p $(KCC)'),$(KCC),$(GCC))
 CPP		= $(CC) -E
 AR		= $(CROSS_COMPILE)ar
 NM		= $(CROSS_COMPILE)nm
--- a/package/powerpc/linux24benh/80-ext23fs-suiddir.patch
+++ b/package/powerpc/linux24benh/80-ext23fs-suiddir.patch
@ -1,152 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/80-ext23fs-suiddir.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---


 See the comments in Configure.help below for details.

 - Clifford

 --- ./fs/ext2/ialloc.c.orig	2002-02-25 20:38:08.000000000 +0100
 +++ ./fs/ext2/ialloc.c	2002-08-06 07:27:56.000000000 +0200
@@ -379,6 +379,13 @@
 			mode |= S_ISGID;
 	} else
 		inode->i_gid = current->fsgid;
 +#ifdef CONFIG_EXT2_FS_SUIDDIR
 +	if (dir->i_mode & S_ISUID) {
 +		mode |= (mode & 0700) >> 3;
 +		if (S_ISDIR(mode))
 +			mode |= S_ISUID;
 +	}
 +#endif
 	inode->i_mode = mode;
 
 	inode->i_ino = ino;
 --- ./fs/ext3/ialloc.c.orig	2002-02-25 20:38:08.000000000 +0100
 +++ ./fs/ext3/ialloc.c	2002-08-06 07:27:56.000000000 +0200
@@ -476,6 +476,13 @@
 			mode |= S_ISGID;
 	} else
 		inode->i_gid = current->fsgid;
 +#ifdef CONFIG_EXT3_FS_SUIDDIR
 +	if (dir->i_mode & S_ISUID) {
 +		mode |= (mode & 0700) >> 3;
 +		if (S_ISDIR(mode))
 +			mode |= S_ISUID;
 +	}
 +#endif
 	inode->i_mode = mode;
 
 	inode->i_ino = j;
 --- ./fs/Config.in.orig	2002-08-06 07:25:58.000000000 +0200
 +++ ./fs/Config.in	2002-08-06 07:29:17.000000000 +0200
@@ -22,6 +22,8 @@
 dep_tristate 'BFS file system support (EXPERIMENTAL)' CONFIG_BFS_FS $CONFIG_EXPERIMENTAL
 
 tristate 'Ext3 journalling file system support' CONFIG_EXT3_FS
 +dep_mbool '  Ext3fs SUID on Directory Extension' CONFIG_EXT3_FS_SUIDDIR $CONFIG_EXT3_FS
 +
 # CONFIG_JBD could be its own option (even modular), but until there are
 # other users than ext3, we will simply make it be the same as CONFIG_EXT3_FS
 # dep_tristate '  Journal Block Device support (JBD for ext3)' CONFIG_JBD $CONFIG_EXT3_FS
@@ -77,6 +79,7 @@
 tristate 'ROM file system support' CONFIG_ROMFS_FS
 
 tristate 'Second extended fs support' CONFIG_EXT2_FS
 +dep_mbool '  Ext2fs SUID on Directory Extension' CONFIG_EXT2_FS_SUIDDIR $CONFIG_EXT2_FS
 
 tristate 'System V/Xenix/V7/Coherent file system support' CONFIG_SYSV_FS
 
 --- ./Documentation/Configure.help.orig	2002-08-03 02:39:42.000000000 +0200
 +++ ./Documentation/Configure.help	2002-08-06 07:27:56.000000000 +0200
@@ -14367,6 +14367,31 @@
   be compiled as a module, and so this could be dangerous.  Most
   everyone wants to say Y here.
 
 +Ext2fs SUID on Directory Extension
 +CONFIG_EXT2_FS_SUIDDIR
 +  As you might know, the SGID flag has a special function on directories:
 +  files within that directories will be owned by the same group that also
 +  owns the directory - which is useful for creating directories which are
 +  shared between the members of a group.
 +
 +  But that only makes sense if the umask is set to give full permissions to
 +  the group (e.g. 007 or 002). Noone would do that if there is a system-wide
 +  'users' group - so some distributions add an extra group for every user
 +  which lets the /etc/group file grow very fast and makes the admins life
 +  harder ...
 +
 +  Activating this feture adds a function to the SUID flag on directories,
 +  which usually has no function at all:
 +
 +  If the SUID flag is set for a diectory, all new files in that directory
 +  will get the same rights in the group-field as they have in their
 +  user-field.  So, if one sets both - SUID and SGID - on a directory, it
 +  will also work with a umask like 022 or 077 and there is no more need for
 +  an extra group for every user.
 +
 +  Also, the SUID flag will be set to all subdirectories of a SUID directory
 +  (as it is already now with the SGID flag on directories).
 +
 Ext3 journalling file system support (EXPERIMENTAL)
 CONFIG_EXT3_FS
   This is the journalling version of the Second extended file system
@@ -14399,6 +14424,31 @@
   of your root partition (the one containing the directory /) cannot
   be compiled as a module, and so this may be dangerous.
 
 +Ext3fs SUID on Directory Extension
 +CONFIG_EXT3_FS_SUIDDIR
 +  As you might know, the SGID flag has a special function on directories:
 +  files within that directories will be owned by the same group that also
 +  owns the directory - which is useful for creating directories which are
 +  shared between the members of a group.
 +
 +  But that only makes sense if the umask is set to give full permissions to
 +  the group (e.g. 007 or 002). Noone would do that if there is a system-wide
 +  'users' group - so some distributions add an extra group for every user
 +  which lets the /etc/group file grow very fast and makes the admins life
 +  harder ...
 +
 +  Activating this feture adds a function to the SUID flag on directories,
 +  which usually has no function at all:
 +
 +  If the SUID flag is set for a diectory, all new files in that directory
 +  will get the same rights in the group-field as they have in their
 +  user-field.  So, if one sets both - SUID and SGID - on a directory, it
 +  will also work with a umask like 022 or 077 and there is no more need for
 +  an extra group for every user.
 +
 +  Also, the SUID flag will be set to all subdirectories of a SUID directory
 +  (as it is already now with the SGID flag on directories).
 +
 Journal Block Device support (JBD for ext3) (EXPERIMENTAL)
 CONFIG_JBD
   This is a generic journalling layer for block devices.  It is
 --- ./CREDITS.orig	2002-08-03 02:39:42.000000000 +0200
 +++ ./CREDITS	2002-08-06 07:27:56.000000000 +0200
@@ -3231,6 +3231,8 @@
 E: god@clifford.at
 W: http://www.clifford.at/
 D: Menuconfig/lxdialog improvement
 +D: Initial Wacom Intuos USB Driver
 +D: Ext[23]FS and Reiserfs SUID on directories extension
 S: Foehrengasse 16
 S: A-2333 Leopoldsdorf b. Wien
 S: Austria
--- a/package/powerpc/linux24benh/82-raid5-niceer-output.patch
+++ b/package/powerpc/linux24benh/82-raid5-niceer-output.patch
@ -1,35 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/82-raid5-niceer-output.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---


 I also sent this patch to the kernel hackers - because the output is
 really confusing when the software RAID code does not choose the fastest
 mode ... Rene

 --- linuxi.orig/drivers/md/xor.c	Sun Sep 30 21:26:06 2001
 +++ linux/drivers/md/xor.c	Fri Dec  7 18:16:10 2001
@@ -127,6 +127,8 @@
 
 #ifdef XOR_SELECT_TEMPLATE
 	fastest = XOR_SELECT_TEMPLATE(fastest);
 +	printk("raid5: using %s to write around L2 cache\n",
 +		fastest->name);
 #endif
 
 	active_template = fastest;
--- a/package/powerpc/linux24benh/88-multiple-soundcard-fix.patch
+++ b/package/powerpc/linux24benh/88-multiple-soundcard-fix.patch
@ -1,89 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/88-multiple-soundcard-fix.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---


 --- linux-2.4.17/drivers/sound/sound_core.c.orig	Sun Jan  6 17:31:30 2002
 +++ linux/drivers/sound/sound_core.c	Sun Jan  6 17:39:43 2002
@@ -17,7 +17,7 @@
  *	plug into this. The fact they dont all go via OSS doesn't mean 
  *	they don't have to implement the OSS API. There is a lot of logic
  *	to keeping much of the OSS weight out of the code in a compatibility
 - *	module, but its up to the driver to rember to load it...
 + *	module, but it's up to the driver to remember to load it...
  *
  *	The code provides a set of functions for registration of devices
  *	by type. This is done rather than providing a single call so that
@@ -173,10 +173,10 @@
 		return r;
 	}
 	
 -	if (r == low)
 +	if ( r < SOUND_STEP )
 		sprintf (name_buf, "%s", name);
 	else
 -		sprintf (name_buf, "%s%d", name, (r - low) / SOUND_STEP);
 +		sprintf (name_buf, "%s%d", name, (r / SOUND_STEP));
 	s->de = devfs_register (devfs_handle, name_buf,
 				DEVFS_FL_NONE, SOUND_MAJOR, s->unit_minor,
 				S_IFCHR | mode, fops, NULL);
@@ -231,17 +231,20 @@
  
 int register_sound_special(struct file_operations *fops, int unit)
 {
 -	char *name;
 +	const int chain = (unit & 0x0F);
 +	int max_unit = chain + 128;
 +	const char *name;
 
 -	switch (unit) {
 +	switch (chain) {
 	    case 0:
 		name = "mixer";
 		break;
 	    case 1:
 		name = "sequencer";
 +		max_unit = unit + 1;
 		break;
 	    case 2:
 -		name = "midi00";
 +		name = "midi";
 		break;
 	    case 3:
 		name = "dsp";
@@ -260,6 +263,7 @@
 		break;
 	    case 8:
 		name = "sequencer2";
 +		max_unit = unit + 1;
 		break;
 	    case 9:
 		name = "dmmidi";
@@ -280,10 +284,10 @@
 		name = "admmidi";
 		break;
 	    default:
 -		name = "unknown";
 +		name = "unknownX";
 		break;
 	}
 -	return sound_insert_unit(&chains[unit&15], fops, -1, unit, unit+1,
 +	return sound_insert_unit(&chains[chain], fops, -1, unit, max_unit,
 				 name, S_IRUSR | S_IWUSR);
 }
  
--- a/package/powerpc/linux24benh/92-nforce-bugfix.patch
+++ b/package/powerpc/linux24benh/92-nforce-bugfix.patch
@ -1,32 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/92-nforce-bugfix.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---


 Needed to build amd74xx.c which does also handle nvidia nforce chipsets (like
 the one on my epox motherboard).  -- Clifford

 --- ./include/linux/pci_ids.h.orig	2003-04-26 00:40:18.000000000 +0200
 +++ ./include/linux/pci_ids.h	2003-04-26 00:40:31.000000000 +0200
@@ -1944,3 +1944,6 @@
 #define PCI_DEVICE_ID_MICROGATE_USC	0x0010
 #define PCI_DEVICE_ID_MICROGATE_SCC	0x0020
 #define PCI_DEVICE_ID_MICROGATE_SCA	0x0030
 +
 +#define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE		0x01bc
 +#define PCI_DEVICE_ID_NVIDIA_NFORCE2_IDE	0x0065
--- a/package/powerpc/linux24benh/95-inet-for-userspace.patch
+++ b/package/powerpc/linux24benh/95-inet-for-userspace.patch
@ -1,56 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/95-inet-for-userspace.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 The in.h file need protection for some defines where the types are not known
 to the user-space and pkt_sched.h missed the inclusion of the types.h
 header which types it utilizes ...

 - Rene Rebe <rene@rocklinux.org>

 --- ./include/linux/in.h.orig	2003-08-28 22:11:50.000000000 +0200
 +++ ./include/linux/in.h	2003-08-28 22:12:27.000000000 +0200
@@ -135,6 +135,8 @@
 	(sizeof(struct ip_msfilter) - sizeof(__u32) \
 	+ (numsrc) * sizeof(__u32))
 
 +#ifdef __KERNEL__
 +
 struct group_req
 {
 	__u32			gr_interface;	/* interface index */
@@ -161,6 +163,8 @@
 	(sizeof(struct group_filter) - sizeof(struct sockaddr_storage) \
 	+ (numsrc) * sizeof(struct sockaddr_storage))
 
 +#endif
 +
 struct in_pktinfo
 {
 	int		ipi_ifindex;
 --- ./include/linux/pkt_sched.h.orig	2003-08-28 22:20:44.000000000 +0200
 +++ ./include/linux/pkt_sched.h	2003-08-28 22:21:11.000000000 +0200
@@ -1,6 +1,8 @@
 #ifndef __LINUX_PKT_SCHED_H
 #define __LINUX_PKT_SCHED_H
 
 +#include <linux/types.h>
 +
 /* Logical priority bands not depending on specific packet scheduler.
    Every scheduler will map them to real traffic classes, if it has
    no more precise mechanism to classify packets.
--- a/package/powerpc/linux24benh/96-quota-for-userspace.patch
+++ b/package/powerpc/linux24benh/96-quota-for-userspace.patch
@ -1,51 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/96-quota-for-userspace.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 Samba needs the struct ...

 - Rene Rebe <rene@rocklinux.org>

 --- linux-2.4.24/include/linux/quota.h.orig	2004-01-09 21:51:11.000000000 +0100
 +++ linux-2.4.24/include/linux/quota.h	2004-01-09 21:55:10.000000000 +0100
@@ -132,12 +132,6 @@
 	__u32 dqi_valid;
 };
 
 -#ifdef __KERNEL__
 -
 -#include <linux/dqblk_xfs.h>
 -#include <linux/dqblk_v1.h>
 -#include <linux/dqblk_v2.h>
 -
 /*
  * Data for one user/group kept in memory
  */
@@ -152,6 +146,12 @@
 	time_t dqb_itime;	/* time limit for excessive inode use */
 };
 
 +#ifdef __KERNEL__
 +
 +#include <linux/dqblk_xfs.h>
 +#include <linux/dqblk_v1.h>
 +#include <linux/dqblk_v2.h>
 +
 /*
  * Data for one quotafile kept in memory
  */
--- a/package/powerpc/linux24benh/99-mol-export.patch-disabled
+++ b/package/powerpc/linux24benh/99-mol-export.patch-disabled
@ -1,10 +0,0 @@
 --- ./arch/ppc/kernel/ppc_ksyms.c.orig	2003-06-21 03:30:49.000000000 +0200
 +++ ./arch/ppc/kernel/ppc_ksyms.c	2003-06-21 03:30:35.000000000 +0200
@@ -367,6 +367,7 @@
 EXPORT_SYMBOL_NOVERS(disarm_decr);
 #ifdef CONFIG_PPC_STD_MMU
 EXPORT_SYMBOL(flush_hash_page); /* For MOL */
 +EXPORT_SYMBOL(__up_read) /* for MOL */
 extern long *intercept_table;
 EXPORT_SYMBOL(intercept_table);
 #endif
--- a/package/powerpc/linux24benh/arch-ppc-config.patch
+++ b/package/powerpc/linux24benh/arch-ppc-config.patch
@ -1,34 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/arch-ppc-config.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- linux-2.4.22/arch/ppc/config.in	2003-08-25 13:44:40.000000000 +0200
 +++ linux-2.4.22-fixed/arch/ppc/config.in	2003-09-16 23:42:48.000000000 +0200
@@ -222,8 +222,10 @@
 
 source drivers/parport/Config.in
 
 -tristate 'Generic /dev/rtc emulation' CONFIG_GEN_RTC
 -if [ "$CONFIG_GEN_RTC" = "n" -a "$CONFIG_APUS" != "y" ]; then
 +if [ "$CONFIG_PPC_RTC" != "y" ]; then
 +  tristate 'Generic /dev/rtc emulation' CONFIG_GEN_RTC
 +fi
 +if [ "$CONFIG_GEN_RTC" != "y" -a "$CONFIG_APUS" != "y" ]; then
   tristate 'Support for /dev/rtc' CONFIG_PPC_RTC
 fi
 
--- a/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch
+++ b/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch
@ -1,30 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/arch-ppc-horizon-name-clash.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- ./drivers/atm/horizon.c.orig	2003-09-04 20:22:19.000000000 +0200
 +++ ./drivers/atm/horizon.c	2003-09-04 20:24:36.000000000 +0200
@@ -481,7 +481,7 @@
   return;
 }
 
 -static inline void dump_regs (hrz_dev * dev) {
 +static inline void dump_horizon_regs (hrz_dev * dev) {
 #ifdef DEBUG_HORIZON
   PRINTD (DBG_REGS, "CONTROL 0: %#x", rd_regl (dev, CONTROL_0_REG));
   PRINTD (DBG_REGS, "RX CONFIG: %#x", rd_regw (dev, RX_CONFIG_OFF));
--- a/package/powerpc/linux24benh/disable-broken.lst
+++ b/package/powerpc/linux24benh/disable-broken.lst
@ -1,25 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/disable-broken.lst
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 CONFIG_EXAMPLE		2000-10-01	2.4.0		example.c
 CONFIG_USB_GADGET	2004-04-30	2.4.25-benh1	# gcc-3.4

--- a/package/powerpc/linux24benh/linux24benh.cache
+++ b/package/powerpc/linux24benh/linux24benh.cache
@ -1,35 +0,0 @@
 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/powerpc/linux24benh/linux24benh.cache
 [COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [TIMESTAMP] 1052207107 Tue May  6 09:45:07 2003
 [CONFIG-ID] 1.7-snapshot-x86-reference
 [ROCKVER] 1.7-snapshot

 [LOGS] 1-linux24.log 5-linux24.log 9-linux24.log

 [BUILDTIME] 112658 (9)
 [SIZE] 28.24 MB, 1301 files

 [DEP] bash binutils bzip2 coreutils e2fsprogs findutils gawk gcc3 glibc23
 [DEP] grep gzip linux24 linux24-header m4 make mktemp module-init-tools
 [DEP] modutils net-tools patch perl5 sed sysfiles tar util-linux

--- a/package/powerpc/linux24benh/linux24benh.conf
+++ b/package/powerpc/linux24benh/linux24benh.conf
@ -1,25 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/linux24benh.conf
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version. A copy of the GNU General Public
 # License can be found at Documentation/COPYING.
 # 
 # Many people helped and are helping developing ROCK Linux. Please
 # have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 # file for details.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 # simply do the same as the linux24 package
 . $base/package/base/linux24/linux24.conf

--- a/package/powerpc/linux24benh/linux24benh.desc
+++ b/package/powerpc/linux24benh/linux24benh.desc
@ -1,49 +0,0 @@

 [COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 [COPY] 
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY] Please add additional copyright information _after_ the line containing
 [COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 [COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 [COPY] 
 [COPY] ROCK Linux: rock-src/package/powerpc/linux24benh/linux24benh.desc
 [COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 [COPY] 
 [COPY] This program is free software; you can redistribute it and/or modify
 [COPY] it under the terms of the GNU General Public License as published by
 [COPY] the Free Software Foundation; either version 2 of the License, or
 [COPY] (at your option) any later version. A copy of the GNU General Public
 [COPY] License can be found at Documentation/COPYING.
 [COPY] 
 [COPY] Many people helped and are helping developing ROCK Linux. Please
 [COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM
 [COPY] file for details.
 [COPY] 
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---

 [I] The Linux kernel precompiled kernel binary image and modules

 [T] This package contains a precompiled kernel image and the modules.

 [U] http://www.kernel.org/

 [A] Linus Toralds <torvalds@transmeta.com>
 [M] Rene Rebe <rene@rocklinux.org>

 [C] base/kernel
 [F] DIETLIBC KERNEL

 [E] group kernel-bin

 [L] GPL
 [S] Stable
 [V] 2.4.25-benh1-rxr
 [P] X -1---5---9 101.200
 [R] + powerpc

 [O] vanilla_ver="2.4.25"
 [O] var_append patchfiles " " "patch-2.4.25-ben1-rxr.bz2"

 [D] 653653278 linux-2.4.25.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.4/
 [D] 1092952665 patch-2.4.25-ben1-rxr.bz2 http://dl.rocklinux-consulting.de/oss/linux24/
 
--- a/package/powerpc/linux24benh/port-orinoco-monitor-0.13e.patch
+++ b/package/powerpc/linux24benh/port-orinoco-monitor-0.13e.patch
@ -1,815 +0,0 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
 # 
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
 # 
 # ROCK Linux: rock-src/package/powerpc/linux24benh/port-orinoco-monitor-0.13e.patch
 # ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf
 # 
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---

 --- orinoco-0.13e/drivers/net/wireless/hermes.c	2003-05-11 23:22:27.000000000 -0700
 +++ orinoco-0.13e-patched/drivers/net/wireless/hermes.c	2003-08-07 04:16:04.000000000 -0700
@@ -183,6 +183,10 @@
 	if (err)
 		return err;
 
 +        for ( k = 0; k < HERMES_NUMPORTS_MAX; k++) {
 +		hw->port_enabled[k] = 0;
 +	}
 +
 	reg = hermes_read_regn(hw, EVSTAT);
 	k = CMD_INIT_TIMEOUT;
 	while ( (! (reg & HERMES_EV_CMD)) && k) {
 diff -aur orinoco-0.13e/hermes.h orinoco-0.13e-patched/hermes.h
 --- orinoco-0.13e/drivers/net/wireless/hermes.h	2003-05-11 23:22:27.000000000 -0700
 +++ orinoco-0.13e-patched/drivers/net/wireless/hermes.h	2003-08-07 04:16:04.000000000 -0700
@@ -33,6 +33,10 @@
 #include <linux/if_ether.h>
 #include <asm/byteorder.h>
 
 +#define		HFA384x_PORTTYPE_IBSS			((uint16_t)3)
 +#define		HFA384x_WEPFLAGS_DISABLE_TXCRYPT	(0x10)
 +#define		HFA384x_WEPFLAGS_DISABLE_RXCRYPT	(0x80)
 +
 /*
  * Limits and constants
  */
@@ -149,6 +153,38 @@
 #define		HERMES_MONITOR_DISABLE		(0x000f)
 
 /*
 + * Configuration RIDs
 + */
 +
 +#define		HERMES_RID_CNF_PORTTYPE		(0xfc00)
 +#define		HERMES_RID_CNF_CHANNEL		(0xfc03)
 +#define		HERMES_RID_CNF_PRISM2_WEP_ON	(0xfc28)
 +
 +/*-- Status Fields --*/
 +#define		HERMES_RXSTATUS_MSGTYPE		(0xE000)
 +#define		HERMES_RXSTATUS_MACPORT		(0x0700)
 +#define		HERMES_RXSTATUS_UNDECR		(0x0002)
 +#define		HERMES_RXSTATUS_FCSERR		(0x0001)
 +
 +/*--------------------------------------------------------------------
 +Communication Frames: Test/Get/Set Field Values for Receive Frames
 +--------------------------------------------------------------------*/
 +#define		HERMES_RXSTATUS_MSGTYPE_GET(value)	(((value) & HERMES_RXSTATUS_MSGTYPE) >> 13)
 +#define		HERMES_RXSTATUS_MSGTYPE_SET(value)	((value) << 13)
 +#define		HERMES_RXSTATUS_MACPORT_GET(value)	(((value) & HERMES_RXSTATUS_MACPORT) >> 8)
 +#define		HERMES_RXSTATUS_MACPORT_SET(value)	((value) << 8)
 +#define		HERMES_RXSTATUS_ISUNDECR(value)	((value) & HERMES_RXSTATUS_UNDECR)
 +#define		HERMES_RXSTATUS_ISFCSERR(value)	((value) & HERMES_RXSTATUS_FCSERR)
 +
 +/*--------------------------------------------------------------------
 +Communication Frames: Field Masks for Receive Frames
 +--------------------------------------------------------------------*/
 +/*-- Offsets --------*/
 +#define		HERMES_RX_DATA_LEN_OFF		(44)
 +#define		HERMES_RX_80211HDR_OFF		(14)
 +#define		HERMES_RX_DATA_OFF			(60)
 +
 +/*
  * Frame structures and constants
  */
 
@@ -286,6 +322,7 @@
 #define HERMES_32BIT_REGSPACING	1
 
 	u16 inten; /* Which interrupts should be enabled? */
 + 	uint8_t		port_enabled[HERMES_NUMPORTS_MAX];
 
 #ifdef HERMES_DEBUG_BUFFER
 	struct hermes_debug_entry dbuf[HERMES_DEBUG_BUFSIZE];
@@ -339,12 +376,14 @@
 
 static inline int hermes_enable_port(hermes_t *hw, int port)
 {
 +        hw->port_enabled[port] = 1;
 	return hermes_docmd_wait(hw, HERMES_CMD_ENABLE | (port << 8),
 				 0, NULL);
 }
 
 static inline int hermes_disable_port(hermes_t *hw, int port)
 {
 +        hw->port_enabled[port] = 0;
 	return hermes_docmd_wait(hw, HERMES_CMD_DISABLE | (port << 8), 
 				 0, NULL);
 }
 diff -aur orinoco-0.13e/orinoco.c orinoco-0.13e-patched/orinoco.c
 --- orinoco-0.13e/drivers/net/wireless/orinoco.c	2003-05-11 23:22:27.000000000 -0700
 +++ orinoco-0.13e-patched/drivers/net/wireless/orinoco.c	2003-08-07 04:16:04.000000000 -0700
@@ -1673,6 +1673,7 @@
 	struct header_struct hdr;
 	struct ethhdr *eh;
 	int err;
 +        struct ieee802_11_hdr hdr80211;
 
 	rxfid = hermes_read_regn(hw, RXFID);
 
@@ -1689,6 +1690,7 @@
 	
 	if (status & HERMES_RXSTAT_ERR) {
 		if (status & HERMES_RXSTAT_UNDECRYPTABLE) {
 +                    if (dev->type != ARPHRD_ETHER) goto sniffing;
 			wstats->discard.code++;
 			DEBUG(1, "%s: Undecryptable frame on Rx. Frame dropped.\n",
 			       dev->name);
@@ -1699,7 +1701,7 @@
 		stats->rx_errors++;
 		goto drop;
 	}
 -
 +sniffing:
 	/* For now we ignore the 802.11 header completely, assuming
            that the card's firmware has handled anything vital */
 
@@ -1730,6 +1732,11 @@
 		goto drop;
 	}
 
 +	/* Now handle frame based on port# */
 +	switch( HERMES_RXSTATUS_MACPORT_GET(status) )
 +	{
 +	case 0:
 +
 	/* We need space for the packet data itself, plus an ethernet
 	   header, plus 2 bytes so we can align the IP header on a
 	   32bit boundary, plus 1 byte so we can read in odd length
@@ -1804,6 +1811,26 @@
 
 	return;
 
 +	case 7:
 +        	if ( ! HERMES_RXSTATUS_ISFCSERR(status) ) {
 +                   if (hermes_bap_pread(hw, IRQ_BAP, &hdr80211, sizeof(hdr80211), 
 +                                       rxfid, HERMES_RX_80211HDR_OFF)) {
 +                      stats->rx_errors++;
 +                   }
 +                   else {
 +                        /* Copy to wlansnif skb */
 +                        orinoco_int_rxmonitor( priv, rxfid, length, &desc, &hdr80211);
 +                   }
 +                } else {
 +                        printk("Received monitor frame: FCSerr set\n");
 +                }
 +                break;
 +	default:
 +		printk("Received frame on unsupported port=%d\n",
 +			HERMES_RXSTATUS_MACPORT_GET(status) );
 +		break;
 +	}
 +
  drop:	
 	stats->rx_dropped++;
 
@@ -2446,6 +2473,24 @@
 	return err;
 }
 
 +//#define SET_MAC_ADDRESS
 +#ifdef SET_MAC_ADDRESS
 +static int
 +orinoco_set_mac_address(struct net_device *dev, void *addr)
 +{
 +  struct orinoco_private *priv = dev->priv;
 +  struct sockaddr *mac = addr;
 +
 +  /* Copy the address */
 +  memcpy(dev->dev_addr, mac->sa_data, WLAN_ADDR_LEN);
 +
 +  /* Reconfig the beast */
 +  orinoco_reset(priv);
 +
 +  return 0;
 +}
 +#endif	/* SET_MAC_ADDRESS */
 +
 static void
 orinoco_tx_timeout(struct net_device *dev)
 {
@@ -3598,6 +3643,173 @@
 	return 0;
 }
 
 +/*----------------------------------------------------------------
 +* orinoco_wlansniff
 +*
 +* Start or stop sniffing.
 +*
 +* Arguments:
 +*	wlandev		wlan device structure
 +*	msgp		ptr to msg buffer
 +*
 +* Returns: 
 +*	0	success and done
 +*	<0	success, but we're waiting for something to finish.
 +*	>0	an error occurred while handling the message.
 +* Side effects:
 +*
 +* Call context:
 +*	process thread  (usually)
 +*	interrupt
 +----------------------------------------------------------------*/
 +static int orinoco_wlansniff(struct net_device *dev, struct iwreq *wrq)
 +{
 +	struct orinoco_private *priv = dev->priv;
 +
 +	hermes_t		*hw = &(priv->hw);
 +        hermes_response_t  resp;
 +	int 			result = 0;
 +	uint16_t			word;
 +
 +	int *parms = (int *) wrq->u.name;
 +	int enable = parms[0] > 0;
 +	unsigned long flags;
 +
 +	orinoco_lock(priv, &flags);
 +
 +	switch (enable)
 +	{
 +	case P80211ENUM_truth_false:
 +		/* Confirm that we're in monitor mode */
 +		if ( dev->type == ARPHRD_ETHER ) {
 +			result = -EFAULT;
 +		}
 +		/* Disable monitor mode */
 +	        word =	HERMES_CMD_MONITOR | (HERMES_MONITOR_DISABLE << 8);
 +	        result = hermes_docmd_wait(hw, word, 0, &resp);
 +
 +		if ( result ) break;
 +
 +		/* Disable port 0 */
 +		result = hermes_disable_port(hw, 0);
 +		if ( result ) break;
 +
 +		/* Clear the driver state */
 +		dev->type = ARPHRD_ETHER;
 +
 +		/* Restore the wepflags */   //Orinoco doesn't like this
 +/*
 +		result = hermes_write_wordrec(hw, USER_BAP,
 +				HERMES_RID_CNF_PRISM2_WEP_ON, 
 +				priv->presniff_wepflags);
 +		if ( result ) break;
 +
 +*/
 +		/* Set the port to its prior type and enable (if necessary) */
 +		if (priv->presniff_port_type != 0 ) {
 +			word = priv->presniff_port_type;
 +			result = hermes_write_wordrec(hw, USER_BAP, 
 +				HERMES_RID_CNF_PORTTYPE, word);
 +		    if ( result ) break;
 +
 +			/* Enable the port */
 +			result = hermes_enable_port(hw, 0);
 +		    if ( result ) break;
 +
 +		}
 +
 +		break;
 +	case P80211ENUM_truth_true:
 +             /* Re-initialize the card before changing channel as advised at
 +              * http://lists.samba.org/pipermail/wireless/2002-June/004491.html
 +              * by Ian Goldberg.  Implementation by Pat Swieskowski.
 +              */
 +//		__orinoco_down(dev);
 +                hermes_set_irqmask(hw, 0);
 +		hermes_init(hw);
 +//		_orinoco_up(dev);
 +                hermes_set_irqmask(hw, ORINOCO_INTEN);
 +/*
 +		__orinoco_stop_irqs(priv);
 +		hermes_reset(hw);
 +		__orinoco_start_irqs(priv, HERMES_EV_RX | HERMES_EV_ALLOC |
 +				   HERMES_EV_TX | HERMES_EV_TXEXC |
 +				   HERMES_EV_WTERR | HERMES_EV_INFO |
 +				   HERMES_EV_INFDROP);
 +*/
 +		/* Disable the port (if enabled), only check Port 0 */
 +		if ( hw->port_enabled[0] ) {
 +			/* Save macport 0 state */
 +			result = hermes_read_wordrec(hw, USER_BAP,
 +					HERMES_RID_CNF_PORTTYPE,
 +					&(priv->presniff_port_type));
 +		    if ( result ) break;
 +
 +			/* Save the wepflags state */
 +			result = hermes_read_wordrec(hw, USER_BAP,
 +					HERMES_RID_CNF_PRISM2_WEP_ON,
 +					&(priv->presniff_wepflags));
 +		    if ( result ) break;
 +			result = hermes_disable_port(hw, 0);
 +		    if ( result ) break;
 +		}
 +		else {
 +			priv->presniff_port_type = 0;
 +		}
 +
 +		/* Set the channel we wish to sniff  */
 +		if (parms[1] > 0 && parms[1] < 15) {
 + 		  word = parms[1];
 +		  result = hermes_write_wordrec(hw, USER_BAP, 
 +				  HERMES_RID_CNF_CHANNEL, word);
 +		} else {
 + 		  result = -EFAULT;
 +		}
 +
 +		if ( result ) break;
 +
 +		/* Set the port type to pIbss */
 +		word = HFA384x_PORTTYPE_IBSS;
 +		result = hermes_write_wordrec(hw, USER_BAP, 
 +				HERMES_RID_CNF_PORTTYPE, word);
 +		if ( result ) break;
 +
 +/*
 +  	        if ( (msg->keepwepflags.status == P80211ENUM_msgitem_status_data_ok) && 
 +                     (msg->keepwepflags.data != P80211ENUM_truth_true)) {
 +		  // Set the wepflags for no decryption   //Orinoco doesn't like this
 +	          word = HFA384x_WEPFLAGS_DISABLE_TXCRYPT | 
 +			     HFA384x_WEPFLAGS_DISABLE_RXCRYPT;
 +		  result = hermes_write_wordrec(hw, USER_BAP, 
 +				 HERMES_RID_CNF_PRISM2_WEP_ON, word); //won't work with the bits above
 +                }
 +		if ( result ) break;
 +
 +*/
 +		/* Enable the port */
 +		result = hermes_enable_port(hw, 0);
 +		if ( result ) break;
 +
 +		/* Enable monitor mode */
 +	        word =	HERMES_CMD_MONITOR | (HERMES_MONITOR_ENABLE << 8);
 +	        result = hermes_docmd_wait(hw, word, 0, &resp);
 +		if ( result ) break;
 +
 +		/* Set the driver state */
 +		/* Do we want the prism2 header? */
 +		if (parms[0] == 1)
 +		  dev->type = ARPHRD_IEEE80211_PRISM;
 +		else 
 +		  dev->type = ARPHRD_IEEE80211;
 +		break;
 +	default:
 +		result = -EFAULT;
 +		break;
 +	}
 +	orinoco_unlock(priv, &flags);
 +	return result;
 +}
 +
 static int
 orinoco_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 {
@@ -3830,6 +4042,9 @@
 				{ SIOCIWFIRSTPRIV + 0x7, 0,
 				  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1,
 				  "get_ibssport" },
 +				{ SIOCIWFIRSTPRIV + 0x8,
 +				  IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2,
 +				  0, "monitor" },
 				{ SIOCIWLASTPRIV, 0, 0, "dump_recs" },
 			};
 
@@ -3924,6 +4139,16 @@
 		err = orinoco_ioctl_getibssport(dev, wrq);
 		break;
 
 +        case SIOCIWFIRSTPRIV + 0x8: /* set sniff (monitor) mode */ 
 +		DEBUG(1, "%s: SIOCIWFIRSTPRIV + 0x8 (monitor)\n",
 +		      dev->name);
 +		if (! capable(CAP_NET_ADMIN)) {
 +			err = -EPERM;
 +			break;
 +		}
 +                err = orinoco_wlansniff(dev, wrq);
 +		break;
 +
 	case SIOCIWLASTPRIV:
 		err = orinoco_debug_dump_recs(dev);
 		if (err)
@@ -4146,6 +4371,9 @@
 	dev->tx_timeout = orinoco_tx_timeout;
 	dev->watchdog_timeo = HZ; /* 1 second timeout */
 	dev->get_stats = orinoco_get_stats;
 +#ifdef SET_MAC_ADDRESS
 +        dev->set_mac_address = orinoco_set_mac_address;
 +#endif	/* SET_MAC_ADDRESS */
 	dev->get_wireless_stats = orinoco_get_wireless_stats;
 	dev->do_ioctl = orinoco_ioctl;
 	dev->change_mtu = orinoco_change_mtu;
@@ -4171,6 +4399,197 @@
 
 }
 
 +/*----------------------------------------------------------------
 +* orinoco_int_rxmonitor
 +*
 +* Helper function for int_rx.  Handles monitor frames.
 +* Note that this function allocates space for the FCS and sets it
 +* to 0xffffffff.  The hfa384x doesn't give us the FCS value but the
 +* higher layers expect it.  0xffffffff is used as a flag to indicate
 +* the FCS is bogus.
 +*
 +* Arguments:
 +*	dev		wlan device structure
 +*	rxfid		received FID
 +*	rxdesc		rx descriptor read from card in int_rx
 +*
 +* Returns: 
 +*	nothing
 +*
 +* Side effects:
 +*	Allocates an skb and passes it up via the PF_PACKET interface.
 +* Call context:
 +*	interrupt
 +----------------------------------------------------------------*/
 +void orinoco_int_rxmonitor( struct orinoco_private *dev, uint16_t rxfid, int len,
 +                            struct hermes_rx_descriptor *rxdesc, struct ieee802_11_hdr *hdr)
 +{
 +	hermes_t			*hw = &(dev->hw);
 +	uint32_t				hdrlen = 0;
 +	uint32_t				datalen = 0;
 +	uint32_t				skblen = 0;
 +	p80211msg_lnxind_wlansniffrm_t	*msg;
 +	struct net_device_stats *stats = &dev->stats;
 +
 +
 +	uint8_t				*datap;
 +	uint16_t				fc;
 +	struct sk_buff			*skb;
 +
 +	/* Don't forget the status, time, and data_len fields are in host order */
 +	/* Figure out how big the frame is */
 +	fc = le16_to_cpu(hdr->frame_ctl);
 +	switch ( WLAN_GET_FC_FTYPE(fc) )
 +	{
 +	case WLAN_FTYPE_DATA:
 +		if ( WLAN_GET_FC_TODS(fc) && WLAN_GET_FC_FROMDS(fc) ) {
 +			hdrlen = WLAN_HDR_A4_LEN;
 +		} else {
 +			hdrlen = WLAN_HDR_A3_LEN;
 +		}
 +		datalen = len;
 +		break;
 +	case WLAN_FTYPE_MGMT:
 +		hdrlen = WLAN_HDR_A3_LEN;
 +		datalen = len;
 +		break;
 +	case WLAN_FTYPE_CTL:
 +		switch ( WLAN_GET_FC_FSTYPE(fc) )
 +		{
 +		case WLAN_FSTYPE_PSPOLL:
 +		case WLAN_FSTYPE_RTS:
 +		case WLAN_FSTYPE_CFEND:
 +		case WLAN_FSTYPE_CFENDCFACK:
 +			hdrlen = 16;
 +			break;
 +		case WLAN_FSTYPE_CTS:
 +		case WLAN_FSTYPE_ACK:
 +			hdrlen = 10;
 +			break;
 +		}
 +		datalen = 0;
 +		break;
 +	default:
 +		printk("unknown frm: fc=0x%04x\n", fc);
 +		return;
 +	}
 +
 +	/* Allocate an ind message+framesize skb */
 +	skblen = sizeof(p80211msg_lnxind_wlansniffrm_t) + 
 +	  hdrlen + datalen;
 +	
 +	/* sanity check the length */
 +	if ( skblen > 
 +		(sizeof(p80211msg_lnxind_wlansniffrm_t) + 
 +		WLAN_HDR_A4_LEN + WLAN_DATA_MAXLEN + WLAN_CRC_LEN) ) {
 +		printk("overlen frm: len=%d\n", 
 +			skblen - sizeof(p80211msg_lnxind_wlansniffrm_t));
 +	}
 +			
 +	if ( (skb = dev_alloc_skb(skblen)) == NULL ) {
 +		printk("alloc_skb failed trying to allocate %d bytes\n", skblen);
 +		return;
 +	}
 +
 +	/* only prepend the prism header if in the right mode */
 +	if (dev->ndev->type != ARPHRD_IEEE80211_PRISM) {
 +	  skb_put(skb, skblen - sizeof(p80211msg_lnxind_wlansniffrm_t));
 +	  datap = skb->data;
 +	} else {
 +	  skb_put(skb, skblen);
 +	  datap = skb->data + sizeof(p80211msg_lnxind_wlansniffrm_t);
 +	  msg = (p80211msg_lnxind_wlansniffrm_t*)skb->data;
 +	  
 +	  /* Initialize the message members */
 +	  msg->msgcode = DIDmsg_lnxind_wlansniffrm;
 +	  msg->msglen = sizeof(p80211msg_lnxind_wlansniffrm_t);
 +	  strcpy(msg->devname, dev->ndev->name);
 +	  
 +	  msg->hosttime.did = DIDmsg_lnxind_wlansniffrm_hosttime;
 +	  msg->hosttime.status = 0;
 +	  msg->hosttime.len = 4;
 +	  msg->hosttime.data = jiffies;
 +	  
 +	  msg->mactime.did = DIDmsg_lnxind_wlansniffrm_mactime;
 +	  msg->mactime.status = 0;
 +	  msg->mactime.len = 4;
 +	  msg->mactime.data = rxdesc->time;
 +	  
 +	  msg->channel.did = DIDmsg_lnxind_wlansniffrm_channel;
 +	  msg->channel.status = P80211ENUM_msgitem_status_no_value;
 +	  msg->channel.len = 4;
 +	  msg->channel.data = 0;
 +
 +	  msg->rssi.did = DIDmsg_lnxind_wlansniffrm_rssi;
 +	  msg->rssi.status = P80211ENUM_msgitem_status_no_value;
 +	  msg->rssi.len = 4;
 +	  msg->rssi.data = 0;
 +	  
 +	  msg->sq.did = DIDmsg_lnxind_wlansniffrm_sq;
 +	  msg->sq.status = P80211ENUM_msgitem_status_no_value;
 +	  msg->sq.len = 4;
 +	  msg->sq.data = 0;
 +	  
 +	  msg->signal.did = DIDmsg_lnxind_wlansniffrm_signal;
 +	  msg->signal.status = 0;
 +	  msg->signal.len = 4;
 +	  msg->signal.data = rxdesc->signal;
 +	  
 +	  msg->noise.did = DIDmsg_lnxind_wlansniffrm_noise;
 +	  msg->noise.status = 0;
 +	  msg->noise.len = 4;
 +	  msg->noise.data = rxdesc->silence;
 +
 +	  msg->rate.did = DIDmsg_lnxind_wlansniffrm_rate;
 +	  msg->rate.status = 0;
 +	  msg->rate.len = 4;
 +	  msg->rate.data = rxdesc->rate / 5; /* set to 802.11 units */
 +  
 +	  msg->istx.did = DIDmsg_lnxind_wlansniffrm_istx;
 +	  msg->istx.status = 0;
 +	  msg->istx.len = 4;
 +	  msg->istx.data = P80211ENUM_truth_false;
 +	  
 +	  msg->frmlen.did = DIDmsg_lnxind_wlansniffrm_frmlen;
 +	  msg->frmlen.status = 0;
 +	  msg->frmlen.len = 4;
 +	  msg->frmlen.data = hdrlen + datalen;
 +	}	  
 +
 +	/* Copy the 802.11 header to the skb (ctl frames may be less than a full header) */
 +	memcpy( datap, &(hdr->frame_ctl), hdrlen);
 +
 +	/* If any, copy the data from the card to the skb */
 +	if ( datalen > 0 )
 +	{
 +		hermes_bap_pread(hw, IRQ_BAP, datap + hdrlen, (datalen+1)&~1,
 +				       rxfid, HERMES_RX_DATA_OFF);
 +
 +		/* check for unencrypted stuff if WEP bit set. */
 +		if (*(datap+1) & 0x40) // wep set
 +		  if ((*(datap+hdrlen) == 0xaa) && (*(datap+hdrlen+1) == 0xaa))
 +		    *(datap+1) &= 0xbf; // clear wep; it's the 802.2 header!
 +	}
 +
 +       /* pass it up via the PF_PACKET interface */
 +       {
 +	   skb->dev = dev->ndev;
 +	   skb->dev->last_rx = jiffies;
 +
 +	   skb->mac.raw = skb->data ;
 +	   skb->ip_summed = CHECKSUM_NONE;
 +	   skb->pkt_type = PACKET_OTHERHOST;
 +	   skb->protocol = htons(ETH_P_80211_RAW);  /* XXX ETH_P_802_2? */
 +
 +	   stats->rx_packets++;
 +	   stats->rx_bytes += skb->len;
 +
 +	   netif_rx(skb);
 +       }
 +
 +	return;
 +}
 +
 /********************************************************************/
 /* Module initialization                                            */
 /********************************************************************/
 diff -aur orinoco-0.13e/orinoco.h orinoco-0.13e-patched/orinoco.h
 --- orinoco-0.13e/drivers/net/wireless/orinoco.h	2003-05-11 23:22:27.000000000 -0700
 +++ orinoco-0.13e-patched/drivers/net/wireless/orinoco.h	2003-08-07 04:16:04.000000000 -0700
@@ -37,6 +37,20 @@
 /* To enable debug messages */
 //#define ORINOCO_DEBUG		3
 
 +#ifndef ETH_P_ECONET
 +#define ETH_P_ECONET   0x0018    /* needed for 2.2.x kernels */
 +#endif
 +
 +#define ETH_P_80211_RAW        (ETH_P_ECONET + 1)
 +
 +#ifndef ARPHRD_IEEE80211
 +#define ARPHRD_IEEE80211 801     /* kernel 2.4.6 */
 +#endif
 +
 +#ifndef ARPHRD_IEEE80211_PRISM  /* kernel 2.4.18 */
 +#define ARPHRD_IEEE80211_PRISM 802
 +#endif
 +
 #if (! defined (WIRELESS_EXT)) || (WIRELESS_EXT < 10)
 #error "orinoco driver requires Wireless extensions v10 or later."
 #endif /* (! defined (WIRELESS_EXT)) || (WIRELESS_EXT < 10) */
@@ -54,6 +68,158 @@
 				HERMES_EV_TXEXC | HERMES_EV_WTERR | HERMES_EV_INFO | \
 				HERMES_EV_INFDROP )
 
 +#define WLAN_DEVNAMELEN_MAX 16
 +
 +/* message data item for INT, BOUNDEDINT, ENUMINT */
 +typedef struct p80211item_uint32
 +{
 +	uint32_t		did		__attribute__ ((packed));
 +	uint16_t		status	__attribute__ ((packed));
 +	uint16_t		len		__attribute__ ((packed));
 +	uint32_t		data	__attribute__ ((packed));
 +} __attribute__ ((packed)) p80211item_uint32_t;
 +
 +typedef struct p80211msg
 +{
 +	uint32_t	msgcode		__attribute__ ((packed));
 +	uint32_t	msglen		__attribute__ ((packed));
 +	uint8_t	devname[WLAN_DEVNAMELEN_MAX]	__attribute__ ((packed));
 +} __attribute__ ((packed)) p80211msg_t;
 +
 +#define DIDmsg_lnxind_wlansniffrm 0x0041
 +#define DIDmsg_lnxind_wlansniffrm_hosttime 0x1041
 +#define DIDmsg_lnxind_wlansniffrm_mactime 0x2041
 +#define DIDmsg_lnxind_wlansniffrm_channel 0x3041
 +#define DIDmsg_lnxind_wlansniffrm_rssi 0x4041
 +#define DIDmsg_lnxind_wlansniffrm_sq 0x5041
 +#define DIDmsg_lnxind_wlansniffrm_signal 0x6041
 +#define DIDmsg_lnxind_wlansniffrm_noise 0x7041
 +#define DIDmsg_lnxind_wlansniffrm_rate 0x8041
 +#define DIDmsg_lnxind_wlansniffrm_istx 0x9041
 +#define DIDmsg_lnxind_wlansniffrm_frmlen 0xA041
 +
 +typedef struct p80211msg_lnxind_wlansniffrm
 +{
 +	uint32_t		msgcode;
 +	uint32_t		msglen;
 +	uint8_t		    devname[WLAN_DEVNAMELEN_MAX];
 +	p80211item_uint32_t	hosttime;
 +	p80211item_uint32_t	mactime;
 +	p80211item_uint32_t	channel;
 +	p80211item_uint32_t	rssi;
 +	p80211item_uint32_t	sq;
 +	p80211item_uint32_t	signal;
 +	p80211item_uint32_t	noise;
 +	p80211item_uint32_t	rate;
 +	p80211item_uint32_t	istx;
 +	p80211item_uint32_t	frmlen;
 +} __attribute__ ((packed)) p80211msg_lnxind_wlansniffrm_t;
 +
 +#define P80211ENUM_truth_false			0
 +#define P80211ENUM_truth_true			1
 +#define P80211ENUM_resultcode_success		1
 +#define P80211ENUM_resultcode_invalid_parameters	2
 +#define P80211ENUM_resultcode_not_supported	3
 +#define P80211ENUM_resultcode_timeout		4
 +#define P80211ENUM_resultcode_too_many_req	5
 +#define P80211ENUM_resultcode_refused		6
 +#define P80211ENUM_resultcode_bss_already	7
 +#define P80211ENUM_resultcode_invalid_access	8
 +#define P80211ENUM_resultcode_invalid_mibattribute	9
 +#define P80211ENUM_resultcode_cant_set_readonly_mib	10
 +#define P80211ENUM_resultcode_implementation_failure	11
 +#define P80211ENUM_resultcode_cant_get_writeonly_mib	12
 +#define P80211ENUM_msgitem_status_data_ok		0
 +#define P80211ENUM_msgitem_status_no_value		1
 +#define P80211ENUM_msgitem_status_invalid_itemname	2
 +#define P80211ENUM_msgitem_status_invalid_itemdata	3
 +#define P80211ENUM_msgitem_status_missing_itemdata	4
 +#define P80211ENUM_msgitem_status_incomplete_itemdata	5
 +#define P80211ENUM_msgitem_status_invalid_msg_did	6
 +#define P80211ENUM_msgitem_status_invalid_mib_did	7
 +#define P80211ENUM_msgitem_status_missing_conv_func	8
 +#define P80211ENUM_msgitem_status_string_too_long	9
 +#define P80211ENUM_msgitem_status_data_out_of_range	10
 +#define P80211ENUM_msgitem_status_string_too_short	11
 +#define P80211ENUM_msgitem_status_missing_valid_func	12
 +#define P80211ENUM_msgitem_status_unknown		13
 +#define P80211ENUM_msgitem_status_invalid_did		14
 +#define P80211ENUM_msgitem_status_missing_print_func	15
 +
 +#define WLAN_GET_FC_FTYPE(n)	(((n) & 0x0C) >> 2)
 +#define WLAN_GET_FC_FSTYPE(n)	(((n) & 0xF0) >> 4)
 +#define WLAN_GET_FC_TODS(n) 	(((n) & 0x0100) >> 8)
 +#define WLAN_GET_FC_FROMDS(n)	(((n) & 0x0200) >> 9)
 +
 +/*--- Sizes -----------------------------------------------*/
 +#define WLAN_ADDR_LEN			6
 +#define WLAN_CRC_LEN			4
 +#define WLAN_BSSID_LEN			6
 +#define WLAN_BSS_TS_LEN			8
 +#define WLAN_HDR_A3_LEN			24
 +#define WLAN_HDR_A4_LEN			30
 +#define WLAN_SSID_MAXLEN		32
 +#define WLAN_DATA_MAXLEN		2312
 +
 +/*--- Frame Control Field -------------------------------------*/
 +/* Frame Types */
 +#define WLAN_FTYPE_MGMT			0x00
 +#define WLAN_FTYPE_CTL			0x01
 +#define WLAN_FTYPE_DATA			0x02
 +
 +/* Frame subtypes */
 +/* Management */
 +#define WLAN_FSTYPE_ASSOCREQ		0x00
 +#define WLAN_FSTYPE_ASSOCRESP		0x01
 +#define WLAN_FSTYPE_REASSOCREQ		0x02
 +#define WLAN_FSTYPE_REASSOCRESP		0x03
 +#define WLAN_FSTYPE_PROBEREQ		0x04 
 +#define WLAN_FSTYPE_PROBERESP		0x05
 +#define WLAN_FSTYPE_BEACON		0x08
 +#define WLAN_FSTYPE_ATIM		0x09
 +#define WLAN_FSTYPE_DISASSOC		0x0a
 +#define WLAN_FSTYPE_AUTHEN		0x0b
 +#define WLAN_FSTYPE_DEAUTHEN		0x0c
 +
 +/* Control */
 +#define WLAN_FSTYPE_PSPOLL		0x0a
 +#define WLAN_FSTYPE_RTS			0x0b
 +#define WLAN_FSTYPE_CTS			0x0c
 +#define WLAN_FSTYPE_ACK			0x0d
 +#define WLAN_FSTYPE_CFEND		0x0e
 +#define WLAN_FSTYPE_CFENDCFACK		0x0f
 +
 +/* Data */
 +#define WLAN_FSTYPE_DATAONLY		0x00
 +#define WLAN_FSTYPE_DATA_CFACK		0x01
 +#define WLAN_FSTYPE_DATA_CFPOLL		0x02
 +#define WLAN_FSTYPE_DATA_CFACK_CFPOLL	0x03
 +#define WLAN_FSTYPE_NULL		0x04
 +#define WLAN_FSTYPE_CFACK		0x05
 +#define WLAN_FSTYPE_CFPOLL		0x06
 +#define WLAN_FSTYPE_CFACK_CFPOLL	0x07
 +
 +/*----------------------------------------------------------------*/
 +/* Magic number, a quick test to see we're getting the desired struct */
 +
 +#define P80211_IOCTL_MAGIC	(0x4a2d464dUL)
 +
 +/*================================================================*/
 +/* Types */
 +
 +/*----------------------------------------------------------------*/
 +/* A ptr to the following structure type is passed as the third */
 +/*  argument to the ioctl system call when issuing a request to */
 +/*  the p80211 module. */
 +
 +typedef struct p80211ioctl_req
 +{
 +	char 	name[WLAN_DEVNAMELEN_MAX] __attribute__ ((packed));
 +	void	*data 		__attribute__ ((packed));
 +	uint32_t	magic 	__attribute__ ((packed));
 +	uint16_t	len 	__attribute__ ((packed));
 +	uint32_t	result 	__attribute__ ((packed));
 +} __attribute__ ((packed)) p80211ioctl_req_t;
 
 struct orinoco_private {
 	void *card;	/* Pointer to card dependent structure */
@@ -116,6 +282,9 @@
 	/* Configuration dependent variables */
 	int port_type, createibss;
 	int promiscuous, mc_count;
 +
 +	uint16_t		presniff_port_type;
 +	uint16_t		presniff_wepflags;
 };
 
 #ifdef ORINOCO_DEBUG
@@ -163,4 +332,12 @@
 	spin_unlock_irqrestore(&priv->lock, *flags);
 }
 
 +/*================================================================*/
 +/* Function Declarations */
 +
 +struct ieee802_11_hdr;
 +
 +void orinoco_int_rxmonitor( struct orinoco_private *dev, uint16_t rxfid, int len,
 +                            struct hermes_rx_descriptor *rxdesc, struct ieee802_11_hdr *hdr);
 +
 #endif /* _ORINOCO_H */