PERFORCE change 143222 for review
Julian Elischer
julian at FreeBSD.org
Mon Jun 9 22:59:53 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=143222
Change 143222 by julian at julian_trafmon1 on 2008/06/09 22:58:57
IFC at 143219
Affected files ...
.. //depot/projects/vimage-commit/src/sys/arm/at91/if_ate.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_machdep.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/boot/common/ufsread.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/conf/NOTES#2 integrate
.. //depot/projects/vimage-commit/src/sys/conf/files.powerpc#2 integrate
.. //depot/projects/vimage-commit/src/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/vimage-commit/src/sys/conf/newvers.sh#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/age/if_age.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/bm/if_bm.c#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bm/if_bmreg.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/bm/if_bmvar.h#1 branch
.. //depot/projects/vimage-commit/src/sys/dev/dc/if_dc.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/mii/lxtphy.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/si/si.c#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/si/si.h#3 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/if_rum.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/if_ural.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/usb/if_zyd.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/mips/include/pte.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/mips/mips/trap.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/modules/Makefile#2 integrate
.. //depot/projects/vimage-commit/src/sys/modules/bm/Makefile#1 branch
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/vimage-commit/src/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/vimage-commit/src/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/vimage-commit/src/sys/powerpc/include/dbdma.h#1 branch
.. //depot/projects/vimage-commit/src/sys/powerpc/powermac/dbdma.c#1 branch
.. //depot/projects/vimage-commit/src/sys/powerpc/powermac/dbdmavar.h#1 branch
.. //depot/projects/vimage-commit/src/sys/sys/mount.h#2 integrate
Differences ...
==== //depot/projects/vimage-commit/src/sys/arm/at91/if_ate.c#2 (text) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.23 2008/01/07 00:36:09 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.24 2008/06/09 21:51:48 wkoszek Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -668,7 +668,7 @@
ATE_LOCK(sc);
/* XXX TSR register should be cleared */
if (sc->sent_mbuf[0]) {
- bus_dmamap_sync(sc->rxtag, sc->tx_map[0],
+ bus_dmamap_sync(sc->mtag, sc->tx_map[0],
BUS_DMASYNC_POSTWRITE);
m_freem(sc->sent_mbuf[0]);
ifp->if_opackets++;
@@ -676,7 +676,7 @@
}
if (sc->sent_mbuf[1]) {
if (RD4(sc, ETH_TSR) & ETH_TSR_IDLE) {
- bus_dmamap_sync(sc->rxtag, sc->tx_map[1],
+ bus_dmamap_sync(sc->mtag, sc->tx_map[1],
BUS_DMASYNC_POSTWRITE);
m_freem(sc->sent_mbuf[1]);
ifp->if_opackets++;
==== //depot/projects/vimage-commit/src/sys/arm/xscale/i8134x/crb_machdep.c#2 (text+ko) ====
@@ -48,7 +48,7 @@
#include "opt_msgbuf.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.6 2008/04/08 10:24:41 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.7 2008/06/09 05:53:04 kevlo Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -77,7 +77,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
@@ -120,7 +119,6 @@
extern u_int undefined_handler_address;
struct pv_addr kernel_pt_table[NUM_KERNEL_PTS];
-extern vm_offset_t sa1_cache_clean_addr;
extern int *end;
struct pcpu __pcpu;
==== //depot/projects/vimage-commit/src/sys/arm/xscale/pxa/pxa_machdep.c#2 (text+ko) ====
@@ -49,7 +49,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_machdep.c,v 1.1 2008/06/06 05:08:09 benno Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_machdep.c,v 1.2 2008/06/09 05:50:42 kevlo Exp $");
#define _ARM32_BUS_DMA_PRIVATE
#include <sys/param.h>
@@ -78,7 +78,6 @@
#include <vm/vm.h>
#include <vm/pmap.h>
-#include <vm/vm.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
@@ -109,11 +108,7 @@
/* Define various stack sizes in pages */
#define IRQ_STACK_SIZE 1
#define ABT_STACK_SIZE 1
-#ifdef IPKDB
-#define UND_STACK_SIZE 2
-#else
#define UND_STACK_SIZE 1
-#endif
extern u_int data_abort_handler_address;
extern u_int prefetch_abort_handler_address;
@@ -123,8 +118,6 @@
extern void *_end;
-extern vm_offset_t sa1_cache_clean_addr;
-
extern int *end;
struct pcpu __pcpu;
@@ -145,7 +138,6 @@
struct pv_addr kernelstack;
struct pv_addr minidataclean;
-void enable_mmu(vm_offset_t);
static struct trapframe proc0_tf;
static void pxa_probe_sdram(bus_space_tag_t, bus_space_handle_t,
@@ -169,14 +161,8 @@
#define SDRAM_START 0xa0000000
-#ifdef DDB
-extern vm_offset_t ksym_start, ksym_end;
-#endif
-
extern vm_offset_t xscale_cache_clean_addr;
-extern void boot_putc(int);
-
void *
initarm(void *arg, void *arg2)
{
@@ -188,58 +174,15 @@
vm_offset_t afterkern;
vm_offset_t freemem_after;
vm_offset_t lastaddr;
-#ifdef DDB
- vm_offset_t zstart = 0, zend = 0;
-#endif
int i, j;
- uint32_t fake_preload[35];
uint32_t memsize[PXA2X0_SDRAM_BANKS], memstart[PXA2X0_SDRAM_BANKS];
- i = 0;
- j = 0;
- boothowto |= RB_SERIAL | RB_SINGLE;
- bootverbose = 1;
-
set_cpufuncs();
- fake_preload[i++] = MODINFO_NAME;
- fake_preload[i++] = strlen("elf kernel") + 1;
- strcpy((char*)&fake_preload[i++], "elf kernel");
- i += 2;
- fake_preload[i++] = MODINFO_TYPE;
- fake_preload[i++] = strlen("elf kernel") + 1;
- strcpy((char*)&fake_preload[i++], "elf kernel");
- i += 2;
- fake_preload[i++] = MODINFO_ADDR;
- fake_preload[i++] = sizeof(vm_offset_t);
- fake_preload[i++] = KERNBASE + 0x00200000;
- fake_preload[i++] = MODINFO_SIZE;
- fake_preload[i++] = sizeof(uint32_t);
- fake_preload[i++] = (uint32_t)&end - KERNBASE - 0x00200000;
-#ifdef DDB
- if (*(uint32_t *)KERNVIRTADDR == MAGIC_TRAMP_NUMBER) {
- fake_preload[i++] = MODINFO_METADATA|MODINFOMD_SSYM;
- fake_preload[i++] = sizeof(vm_offset_t);
- fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 4);
- fake_preload[i++] = MODINFO_METADATA|MODINFOMD_ESYM;
- fake_preload[i++] = sizeof(vm_offset_t);
- fake_preload[i++] = *(uint32_t *)(KERNVIRTADDR + 8);
- lastaddr = *(uint32_t *)(KERNVIRTADDR + 8);
- zend = lastaddr;
- zstart = *(uint32_t *)(KERNVIRTADDR + 4);
- ksym_start = zstart;
- ksym_end = zend;
- } else
-#endif
- lastaddr = (vm_offset_t)&end;
- fake_preload[i++] = 0;
- fake_preload[i] = 0;
- preload_metadata = (void *)fake_preload;
-
+ lastaddr = fake_preload_metadata();
pcpu_init(pcpup, 0, sizeof(struct pcpu));
PCPU_SET(curthread, &thread0);
-#define KERNEL_TEXT_BASE (KERNBASE + 0x00200000)
freemempos = 0xa0200000;
/* Define a macro to simplify memory allocation */
#define valloc_pages(var, np) \
==== //depot/projects/vimage-commit/src/sys/boot/common/ufsread.c#2 (text+ko) ====
@@ -44,7 +44,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.17 2007/10/26 21:02:31 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.18 2008/06/07 05:49:24 kib Exp $");
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
@@ -249,7 +249,7 @@
} else if (lbn < NDADDR + NINDIR(fs)) {
n = INDIRPERVBLK(fs);
addr = DIP(di_ib[0]);
- u = (u_int)(lbn - NDADDR) / (n * DBPERVBLK);
+ u = (u_int)(lbn - NDADDR) / n * DBPERVBLK;
vbaddr = fsbtodb(fs, addr) + u;
if (indmap != vbaddr) {
if (dskread(indbuf, vbaddr, DBPERVBLK))
==== //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biossmap.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.7 2007/10/28 21:23:49 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.8 2008/06/07 03:07:32 jhb Exp $");
/*
* Obtain memory configuration information from the BIOS
@@ -39,7 +39,10 @@
#include "libi386.h"
#include "btxv86.h"
-static struct bios_smap smap;
+static struct {
+ struct bios_smap _smap_entry;
+ char pad[8]; /* Bad BIOS writer, no cookie! */
+} smap;
static struct bios_smap *smapbase;
static int smaplen;
==== //depot/projects/vimage-commit/src/sys/compat/linux/linux_file.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.113 2008/04/23 15:56:33 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.114 2008/06/08 11:09:25 rdivacky Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -289,7 +289,7 @@
*/
struct l_dirent {
- l_long d_ino;
+ l_ulong d_ino;
l_off_t d_off;
l_ushort d_reclen;
char d_name[LINUX_NAME_MAX + 1];
@@ -446,7 +446,7 @@
if (justone) {
/* readdir(2) case. */
- linux_dirent.d_ino = (l_long)bdp->d_fileno;
+ linux_dirent.d_ino = bdp->d_fileno;
linux_dirent.d_off = (l_off_t)linuxreclen;
linux_dirent.d_reclen = (l_ushort)bdp->d_namlen;
strcpy(linux_dirent.d_name, bdp->d_name);
==== //depot/projects/vimage-commit/src/sys/conf/NOTES#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1492 2008/05/27 01:54:45 yongari Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1494 2008/06/08 01:58:11 marcel Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
==== //depot/projects/vimage-commit/src/sys/conf/files.powerpc#2 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.powerpc,v 1.77 2008/04/30 00:50:50 marcel Exp $
+# $FreeBSD: src/sys/conf/files.powerpc,v 1.79 2008/06/07 22:58:32 marcel Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -27,6 +27,7 @@
crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb
+dev/bm/if_bm.c optional bm powermac
dev/fb/fb.c optional sc
dev/hwpmc/hwpmc_powerpc.c optional hwpmc
dev/kbd/kbd.c optional sc
@@ -107,6 +108,7 @@
powerpc/ofw/ofw_syscons.c optional sc aim
powerpc/powermac/ata_kauai.c optional powermac ata
powerpc/powermac/ata_macio.c optional powermac ata
+powerpc/powermac/dbdma.c optional powermac pci
powerpc/powermac/grackle.c optional powermac pci
powerpc/powermac/hrowpic.c optional powermac pci
powerpc/powermac/macio.c optional powermac pci
==== //depot/projects/vimage-commit/src/sys/conf/kern.pre.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.98 2008/05/23 03:53:49 jb Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.99 2008/06/09 06:31:17 jb Exp $
# Part of a unified Makefile for building kernels. This part contains all
# of the definitions that need to be before %BEFORE_DEPEND.
@@ -33,8 +33,6 @@
. endif
. if ${MACHINE_ARCH} == "amd64"
COPTFLAGS?=-O2 -frename-registers -pipe
-. elif ${MACHINE_ARCH} == "sparc64"
-COPTFLAGS?=-pipe
. else
COPTFLAGS?=${_MINUS_O} -pipe
. endif
==== //depot/projects/vimage-commit/src/sys/conf/newvers.sh#2 (text+ko) ====
@@ -28,7 +28,7 @@
# SUCH DAMAGE.
#
# @(#)newvers.sh 8.1 (Berkeley) 4/20/94
-# $FreeBSD: src/sys/conf/newvers.sh,v 1.73 2007/10/11 04:28:07 kensmith Exp $
+# $FreeBSD: src/sys/conf/newvers.sh,v 1.75 2008/06/08 19:46:23 dougb Exp $
TYPE="FreeBSD"
REVISION="8.0"
@@ -86,10 +86,26 @@
touch version
v=`cat version` u=${USER:-root} d=`pwd` h=${HOSTNAME:-`hostname`} t=`date`
i=`${MAKE:-make} -V KERN_IDENT`
+
+for dir in /bin /usr/bin /usr/local/bin; do
+ if [ -x "${dir}/svnversion" ]; then
+ svnversion=${dir}/svnversion
+ SRCDIR=${d##*obj}
+ SRCDIR=${SRCDIR%%/sys/*}
+ break
+ fi
+done
+
+if [ -n "$svnversion" -a -d "${SRCDIR}/.svn" ] ; then
+ svn=" @`cd $SRCDIR && $svnversion`"
+else
+ svn=""
+fi
+
cat << EOF > vers.c
$COPYRIGHT
-#define SCCSSTR "@(#)${VERSION} #${v}: ${t}"
-#define VERSTR "${VERSION} #${v}: ${t}\\n ${u}@${h}:${d}\\n"
+#define SCCSSTR "@(#)${VERSION} #${v}${svn}: ${t}"
+#define VERSTR "${VERSION} #${v}${svn}: ${t}\\n ${u}@${h}:${d}\\n"
#define RELSTR "${RELEASE}"
char sccs[sizeof(SCCSSTR) > 128 ? sizeof(SCCSSTR) : 128] = SCCSSTR;
==== //depot/projects/vimage-commit/src/sys/dev/age/if_age.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.1 2008/05/19 01:39:59 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/age/if_age.c,v 1.2 2008/06/08 14:42:43 rpaulo Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -387,7 +387,7 @@
* specification such that driver could not use
* pci_get_vpd_readonly(9) with keyword 'NA'.
* Search VPD data starting at address 0x0100. The data
- * chwould be used as initializers to set AGE_PAR0,
+ * should be used as initializers to set AGE_PAR0,
* AGE_PAR1 register including other PCI configuration
* registers.
*/
==== //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.190 2008/05/29 00:14:35 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.191 2008/06/07 18:38:02 sam Exp $");
/*
* Driver for the Atheros Wireless LAN controller.
@@ -169,7 +169,8 @@
struct ath_descdma *, ath_bufhead *);
static int ath_desc_alloc(struct ath_softc *);
static void ath_desc_free(struct ath_softc *);
-static struct ieee80211_node *ath_node_alloc(struct ieee80211_node_table *);
+static struct ieee80211_node *ath_node_alloc(struct ieee80211vap *,
+ const uint8_t [IEEE80211_ADDR_LEN]);
static void ath_node_free(struct ieee80211_node *);
static void ath_node_getsignal(const struct ieee80211_node *,
int8_t *, int8_t *);
@@ -3659,9 +3660,9 @@
}
static struct ieee80211_node *
-ath_node_alloc(struct ieee80211_node_table *nt)
+ath_node_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN])
{
- struct ieee80211com *ic = nt->nt_ic;
+ struct ieee80211com *ic = vap->iv_ic;
struct ath_softc *sc = ic->ic_ifp->if_softc;
const size_t space = sizeof(struct ath_node) + sc->sc_rc->arc_space;
struct ath_node *an;
==== //depot/projects/vimage-commit/src/sys/dev/dc/if_dc.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.194 2008/03/24 17:38:24 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/dc/if_dc.c,v 1.195 2008/06/08 02:52:26 yongari Exp $");
/*
* DEC "tulip" clone ethernet driver. Supports the DEC/Intel 21143
@@ -1141,7 +1141,7 @@
static void
dc_setfilt_admtek(struct dc_softc *sc)
{
- uint32_t eaddr[(ETHER_ADDR_LEN+3)/4];
+ uint8_t eaddr[ETHER_ADDR_LEN];
struct ifnet *ifp;
struct ifmultiaddr *ifma;
int h = 0;
@@ -1151,8 +1151,9 @@
/* Init our MAC address. */
bcopy(IF_LLADDR(sc->dc_ifp), eaddr, ETHER_ADDR_LEN);
- CSR_WRITE_4(sc, DC_AL_PAR0, eaddr[0]);
- CSR_WRITE_4(sc, DC_AL_PAR1, eaddr[1]);
+ CSR_WRITE_4(sc, DC_AL_PAR0, eaddr[3] << 24 | eaddr[2] << 16 |
+ eaddr[1] << 8 | eaddr[0]);
+ CSR_WRITE_4(sc, DC_AL_PAR1, eaddr[5] << 8 | eaddr[4]);
/* If we want promiscuous mode, set the allframes bit. */
if (ifp->if_flags & IFF_PROMISC)
@@ -1812,7 +1813,7 @@
u_int32_t command;
struct dc_softc *sc;
struct ifnet *ifp;
- u_int32_t revision;
+ u_int32_t reg, revision;
int error = 0, rid, mac_offset;
int i;
u_int8_t *mac;
@@ -2052,8 +2053,15 @@
break;
case DC_TYPE_AL981:
case DC_TYPE_AN985:
- eaddr[0] = CSR_READ_4(sc, DC_AL_PAR0);
- eaddr[1] = CSR_READ_4(sc, DC_AL_PAR1);
+ reg = CSR_READ_4(sc, DC_AL_PAR0);
+ mac = (uint8_t *)&eaddr[0];
+ mac[0] = (reg >> 0) & 0xff;
+ mac[1] = (reg >> 8) & 0xff;
+ mac[2] = (reg >> 16) & 0xff;
+ mac[3] = (reg >> 24) & 0xff;
+ reg = CSR_READ_4(sc, DC_AL_PAR1);
+ mac[4] = (reg >> 0) & 0xff;
+ mac[5] = (reg >> 8) & 0xff;
break;
case DC_TYPE_CONEXANT:
bcopy(sc->dc_srom + DC_CONEXANT_EE_NODEADDR, &eaddr,
==== //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwi.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.62 2008/05/12 00:15:28 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.63 2008/06/07 18:38:02 sam Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@@ -147,7 +147,8 @@
int);
static void iwi_reset_rx_ring(struct iwi_softc *, struct iwi_rx_ring *);
static void iwi_free_rx_ring(struct iwi_softc *, struct iwi_rx_ring *);
-static struct ieee80211_node *iwi_node_alloc(struct ieee80211_node_table *);
+static struct ieee80211_node *iwi_node_alloc(struct ieee80211vap *,
+ const uint8_t [IEEE80211_ADDR_LEN]);
static void iwi_node_free(struct ieee80211_node *);
static void iwi_media_status(struct ifnet *, struct ifmediareq *);
static int iwi_newstate(struct ieee80211vap *, enum ieee80211_state, int);
@@ -903,14 +904,14 @@
}
static struct ieee80211_node *
-iwi_node_alloc(struct ieee80211_node_table *nt)
+iwi_node_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct iwi_node *in;
in = malloc(sizeof (struct iwi_node), M_80211_NODE, M_NOWAIT | M_ZERO);
if (in == NULL)
return NULL;
-
+ /* XXX assign sta table entry for adhoc */
in->in_station = -1;
return &in->in_node;
==== //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.6 2008/05/26 07:40:14 delphij Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/iwn/if_iwn.c,v 1.7 2008/06/07 18:38:02 sam Exp $");
#include <sys/param.h>
#include <sys/sockio.h>
@@ -103,7 +103,8 @@
int);
void iwn_reset_tx_ring(struct iwn_softc *, struct iwn_tx_ring *);
void iwn_free_tx_ring(struct iwn_softc *, struct iwn_tx_ring *);
-struct ieee80211_node *iwn_node_alloc(struct ieee80211_node_table *);
+static struct ieee80211_node *iwn_node_alloc(struct ieee80211vap *,
+ const uint8_t [IEEE80211_ADDR_LEN]);
void iwn_newassoc(struct ieee80211_node *, int);
int iwn_media_change(struct ifnet *);
int iwn_newstate(struct ieee80211vap *, enum ieee80211_state, int);
@@ -941,7 +942,7 @@
}
struct ieee80211_node *
-iwn_node_alloc(struct ieee80211_node_table *ic)
+iwn_node_alloc(struct ieee80211vap *vap, const uint8_t mac[IEEE80211_ADDR_LEN])
{
return malloc(sizeof (struct iwn_node), M_80211_NODE,M_NOWAIT | M_ZERO);
}
==== //depot/projects/vimage-commit/src/sys/dev/mii/lxtphy.c#2 (text+ko) ====
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.19 2007/01/12 22:27:46 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/lxtphy.c,v 1.20 2008/06/07 22:58:32 marcel Exp $");
/*
* driver for Level One's LXT-970 ethernet 10/100 PHY
@@ -139,6 +139,7 @@
struct mii_softc *sc;
struct mii_attach_args *ma;
struct mii_data *mii;
+ const char *nic;
sc = device_get_softc(dev);
ma = device_get_ivars(dev);
@@ -159,6 +160,15 @@
PHY_READ(sc, MII_BMSR) & ma->mii_capmask;
device_printf(dev, " ");
+ /*
+ * On Apple BMAC controllers, we end up in a weird state
+ * of partially-completed autonegotiation on boot. So
+ * force autonegotation to try again.
+ */
+ nic = device_get_name(device_get_parent(sc->mii_dev));
+ if (strcmp(nic, "bm") == 0)
+ sc->mii_flags |= MIIF_FORCEANEG | MIIF_NOISOLATE;
+
#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL)
ADD(IFM_MAKEWORD(IFM_ETHER, IFM_100_FX, 0, sc->mii_inst),
MII_MEDIA_100_TX);
==== //depot/projects/vimage-commit/src/sys/dev/ral/rt2560.c#2 (text) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/ral/rt2560.c,v 1.25 2008/05/12 00:32:52 sam Exp $ */
+/* $FreeBSD: src/sys/dev/ral/rt2560.c,v 1.26 2008/06/07 18:38:02 sam Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.25 2008/05/12 00:32:52 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ral/rt2560.c,v 1.26 2008/06/07 18:38:02 sam Exp $");
/*-
* Ralink Technology RT2560 chipset driver
@@ -104,8 +104,8 @@
struct rt2560_rx_ring *);
static void rt2560_free_rx_ring(struct rt2560_softc *,
struct rt2560_rx_ring *);
-static struct ieee80211_node *rt2560_node_alloc(
- struct ieee80211_node_table *);
+static struct ieee80211_node *rt2560_node_alloc(struct ieee80211vap *,
+ const uint8_t [IEEE80211_ADDR_LEN]);
static void rt2560_newassoc(struct ieee80211_node *, int);
static int rt2560_newstate(struct ieee80211vap *,
enum ieee80211_state, int);
@@ -767,7 +767,8 @@
}
static struct ieee80211_node *
-rt2560_node_alloc(struct ieee80211_node_table *nt)
+rt2560_node_alloc(struct ieee80211vap *vap,
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct rt2560_node *rn;
==== //depot/projects/vimage-commit/src/sys/dev/ral/rt2661.c#2 (text) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/ral/rt2661.c,v 1.25 2008/05/12 00:32:52 sam Exp $ */
+/* $FreeBSD: src/sys/dev/ral/rt2661.c,v 1.26 2008/06/07 18:38:02 sam Exp $ */
/*-
* Copyright (c) 2006
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.25 2008/05/12 00:32:52 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ral/rt2661.c,v 1.26 2008/06/07 18:38:02 sam Exp $");
/*-
* Ralink Technology RT2561, RT2561S and RT2661 chipset driver
@@ -101,8 +101,8 @@
struct rt2661_rx_ring *);
static void rt2661_free_rx_ring(struct rt2661_softc *,
struct rt2661_rx_ring *);
-static struct ieee80211_node *rt2661_node_alloc(
- struct ieee80211_node_table *);
+static struct ieee80211_node *rt2661_node_alloc(struct ieee80211vap *,
+ const uint8_t [IEEE80211_ADDR_LEN]);
static void rt2661_newassoc(struct ieee80211_node *, int);
static int rt2661_newstate(struct ieee80211vap *,
enum ieee80211_state, int);
@@ -776,7 +776,8 @@
}
static struct ieee80211_node *
-rt2661_node_alloc(struct ieee80211_node_table *nt)
+rt2661_node_alloc(struct ieee80211vap *vap,
+ const uint8_t mac[IEEE80211_ADDR_LEN])
{
struct rt2661_node *rn;
==== //depot/projects/vimage-commit/src/sys/dev/si/si.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/si/si.c,v 1.140 2008/06/06 03:21:59 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/si/si.c,v 1.141 2008/06/09 08:43:27 ed Exp $");
#ifndef lint
static const char si_copyright1[] = "@(#) Copyright (C) Specialix International, 1990,1992,1998",
@@ -682,7 +682,6 @@
#if 1
DPRINT((0, DBG_IOCTL, "TCSI_PORT=%x\n", TCSI_PORT));
DPRINT((0, DBG_IOCTL, "TCSI_CCB=%x\n", TCSI_CCB));
- DPRINT((0, DBG_IOCTL, "TCSI_TTY=%x\n", TCSI_TTY));
#endif
oldspl = spltty(); /* better safe than sorry */
@@ -788,10 +787,6 @@
SUCHECK;
si_vbcopy(xpp->sp_ccb, &sps->tc_ccb, sizeof(sps->tc_ccb));
break;
- case TCSI_TTY:
- SUCHECK;
- si_bcopy(xpp->sp_tty, &sps->tc_tty, sizeof(sps->tc_tty));
- break;
default:
error = EINVAL;
goto out;
==== //depot/projects/vimage-commit/src/sys/dev/si/si.h#3 (text+ko) ====
@@ -30,7 +30,7 @@
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHORS BE LIABLE.
*
- * $FreeBSD: src/sys/dev/si/si.h,v 1.21 2008/06/06 03:21:59 peter Exp $
+ * $FreeBSD: src/sys/dev/si/si.h,v 1.22 2008/06/09 08:43:27 ed Exp $
*/
#include <sys/callout.h>
@@ -385,7 +385,6 @@
/* Various stats and monitoring hooks per tty device */
#define TCSI_PORT _IOWR('S', 125, struct si_pstat) /* get si_port */
#define TCSI_CCB _IOWR('S', 126, struct si_pstat) /* get si_ccb */
-#define TCSI_TTY _IOWR('S', 127, struct si_pstat) /* get tty struct */
#define IOCTL_MAX 127
==== //depot/projects/vimage-commit/src/sys/dev/usb/if_rum.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.22 2008/05/12 00:32:52 sam Exp $ */
+/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.23 2008/06/07 18:38:02 sam Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini at free.fr>
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.22 2008/05/12 00:32:52 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.23 2008/06/07 18:38:02 sam Exp $");
/*-
* Ralink Technology RT2501USB/RT2601USB chipset driver
@@ -195,7 +195,8 @@
struct ieee80211vap *);
static int rum_raw_xmit(struct ieee80211_node *, struct mbuf *,
const struct ieee80211_bpf_params *);
-static struct ieee80211_node *rum_node_alloc(struct ieee80211_node_table *);
+static struct ieee80211_node *rum_node_alloc(struct ieee80211vap *,
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void rum_newassoc(struct ieee80211_node *, int);
static void rum_scan_start(struct ieee80211com *);
static void rum_scan_end(struct ieee80211com *);
@@ -2394,7 +2395,8 @@
/* ARGUSED */
static struct ieee80211_node *
-rum_node_alloc(struct ieee80211_node_table *nt __unused)
+rum_node_alloc(struct ieee80211vap *vap __unused,
+ const uint8_t mac[IEEE80211_ADDR_LEN] __unused)
{
struct rum_node *rn;
==== //depot/projects/vimage-commit/src/sys/dev/usb/if_ural.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.73 2008/05/12 00:32:52 sam Exp $ */
+/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.74 2008/06/07 18:38:02 sam Exp $ */
/*-
* Copyright (c) 2005, 2006
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.73 2008/05/12 00:32:52 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.74 2008/06/07 18:38:02 sam Exp $");
/*-
* Ralink Technology RT2500USB chipset driver
@@ -156,7 +156,8 @@
static void ural_bbp_write(struct ural_softc *, uint8_t, uint8_t);
static uint8_t ural_bbp_read(struct ural_softc *, uint8_t);
static void ural_rf_write(struct ural_softc *, uint8_t, uint32_t);
-static struct ieee80211_node *ural_node_alloc(struct ieee80211_node_table *);
+static struct ieee80211_node *ural_node_alloc(struct ieee80211vap *,
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void ural_newassoc(struct ieee80211_node *, int);
static void ural_scan_start(struct ieee80211com *);
static void ural_scan_end(struct ieee80211com *);
@@ -1759,7 +1760,8 @@
/* ARGUSED */
static struct ieee80211_node *
-ural_node_alloc(struct ieee80211_node_table *nt __unused)
+ural_node_alloc(struct ieee80211vap *vap __unused,
+ const uint8_t mac[IEEE80211_ADDR_LEN] __unused)
{
struct ural_node *un;
==== //depot/projects/vimage-commit/src/sys/dev/usb/if_zyd.c#2 (text+ko) ====
@@ -1,6 +1,6 @@
/* $OpenBSD: if_zyd.c,v 1.52 2007/02/11 00:08:04 jsg Exp $ */
/* $NetBSD: if_zyd.c,v 1.7 2007/06/21 04:04:29 kiyohara Exp $ */
-/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.17 2008/05/12 00:32:52 sam Exp $ */
+/* $FreeBSD: src/sys/dev/usb/if_zyd.c,v 1.18 2008/06/07 18:38:02 sam Exp $ */
/*-
* Copyright (c) 2006 by Damien Bergamini <damien.bergamini at free.fr>
@@ -163,7 +163,8 @@
static void zyd_free_tx_list(struct zyd_softc *);
static int zyd_alloc_rx_list(struct zyd_softc *);
static void zyd_free_rx_list(struct zyd_softc *);
-static struct ieee80211_node *zyd_node_alloc(struct ieee80211_node_table *);
+static struct ieee80211_node *zyd_node_alloc(struct ieee80211vap *,
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static void zyd_task(void *);
static int zyd_newstate(struct ieee80211vap *, enum ieee80211_state, int);
static int zyd_cmd(struct zyd_softc *, uint16_t, const void *, int,
@@ -698,7 +699,8 @@
/* ARGUSED */
static struct ieee80211_node *
-zyd_node_alloc(struct ieee80211_node_table *nt __unused)
+zyd_node_alloc(struct ieee80211vap *vap __unused,
+ const uint8_t mac[IEEE80211_ADDR_LEN] __unused)
{
struct zyd_node *zn;
==== //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpi.c#2 (text+ko) ====
@@ -19,7 +19,7 @@
#define VERSION "20071127"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.14 2008/05/16 04:15:54 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.15 2008/06/07 18:38:02 sam Exp $");
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -170,7 +170,8 @@
int, int);
static void wpi_reset_tx_ring(struct wpi_softc *, struct wpi_tx_ring *);
static void wpi_free_tx_ring(struct wpi_softc *, struct wpi_tx_ring *);
-static struct ieee80211_node *wpi_node_alloc(struct ieee80211_node_table *);
+static struct ieee80211_node *wpi_node_alloc(struct ieee80211vap *,
+ const uint8_t mac[IEEE80211_ADDR_LEN]);
static int wpi_newstate(struct ieee80211vap *, enum ieee80211_state, int);
static void wpi_mem_lock(struct wpi_softc *);
static void wpi_mem_unlock(struct wpi_softc *);
@@ -1246,7 +1247,8 @@
/* ARGSUSED */
static struct ieee80211_node *
-wpi_node_alloc(struct ieee80211_node_table *ic)
+wpi_node_alloc(struct ieee80211vap *vap __unused,
+ const uint8_t mac[IEEE80211_ADDR_LEN] __unused)
{
struct wpi_node *wn;
==== //depot/projects/vimage-commit/src/sys/kern/vfs_export.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.342 2008/05/09 23:02:55 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_export.c,v 1.343 2008/06/09 10:31:38 kib Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -255,6 +255,7 @@
nep = mp->mnt_export;
error = 0;
+ lockmgr(&mp->mnt_explock, LK_EXCLUSIVE, NULL);
if (argp->ex_flags & MNT_DELEXPORT) {
if (nep == NULL) {
error = ENOENT;
@@ -294,6 +295,7 @@
}
out:
+ lockmgr(&mp->mnt_explock, LK_RELEASE, NULL);
/*
* Once we have executed the vfs_export() command, we do
* not want to keep the "export" option around in the
@@ -443,7 +445,9 @@
{
struct netcred *np;
+ lockmgr(&mp->mnt_explock, LK_SHARED, NULL);
np = vfs_export_lookup(mp, nam);
+ lockmgr(&mp->mnt_explock, LK_RELEASE, NULL);
if (np == NULL)
return (EACCES);
*extflagsp = np->netc_exflags;
==== //depot/projects/vimage-commit/src/sys/kern/vfs_mount.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.282 2008/05/23 23:33:07 rodrigc Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.284 2008/06/09 10:31:38 kib Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -68,13 +68,8 @@
#include <security/mac/mac_framework.h>
#include "opt_rootdevname.h"
-#include "opt_ddb.h"
#include "opt_mac.h"
-#ifdef DDB
-#include <ddb/ddb.h>
-#endif
-
#define ROOTNAME "root_device"
#define VFS_MOUNTARG_SIZE_MAX (1024 * 64)
@@ -457,6 +452,7 @@
mp = (struct mount *)mem;
mtx_init(&mp->mnt_mtx, "struct mount mtx", NULL, MTX_DEF);
lockinit(&mp->mnt_lock, PVFS, "vfslock", 0, 0);
+ lockinit(&mp->mnt_explock, PVFS, "explock", 0, 0);
return (0);
}
@@ -466,6 +462,7 @@
struct mount *mp;
mp = (struct mount *)mem;
+ lockdestroy(&mp->mnt_explock);
lockdestroy(&mp->mnt_lock);
mtx_destroy(&mp->mnt_mtx);
}
==== //depot/projects/vimage-commit/src/sys/mips/include/pte.h#2 (text+ko) ====
@@ -40,7 +40,7 @@
* from: Utah Hdr: pte.h 1.11 89/09/03
* from: @(#)pte.h 8.1 (Berkeley) 6/10/93
* JNPR: pte.h,v 1.1.4.1 2007/09/10 06:20:19 girish
- * $FreeBSD: src/sys/mips/include/pte.h,v 1.1 2008/04/13 07:22:52 imp Exp $
+ * $FreeBSD: src/sys/mips/include/pte.h,v 1.2 2008/06/08 08:56:46 wkoszek Exp $
*/
#ifndef _MACHINE_PTE_H_
@@ -121,7 +121,7 @@
#define vad_to_pfn64(x) ((quad_t)(x) >> PTE_SHIFT) & PTE_FRAME)
#define pfn_to_vad(x) (((x) & PTE_FRAME) << PTE_SHIFT)
-/* User viritual to pte offset in page table */
+/* User virtual to pte offset in page table */
#define vad_to_pte_offset(adr) (((adr) >> PGSHIFT) & (NPTEPG -1))
#define mips_pg_v(entry) ((entry) & PTE_V)
==== //depot/projects/vimage-commit/src/sys/mips/mips/trap.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
* JNPR: trap.c,v 1.13.2.2 2007/08/29 10:03:49 girish
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/mips/mips/trap.c,v 1.1 2008/04/13 07:27:37 imp Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list