Module Name: src
Committed By: christos
Date: Sat Mar 30 02:39:00 UTC 2013
Modified Files:
src/external/bsd/wpa/bin/hostapd: hostapd.8
src/share/man/man4: Makefile
src/sys/arch/amd64/conf: GENERIC
src/sys/conf: files
src/sys/dev/cardbus: files.cardbus
src/sys/dev/pci: files.pci
Log Message:
patches for new wifi devices.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/wpa/bin/hostapd/hostapd.8
cvs rdiff -u -r1.596 -r1.597 src/share/man/man4/Makefile
cvs rdiff -u -r1.368 -r1.369 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.1065 -r1.1066 src/sys/conf/files
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/cardbus/files.cardbus
cvs rdiff -u -r1.363 -r1.364 src/sys/dev/pci/files.pci
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/bin/hostapd/hostapd.8
diff -u src/external/bsd/wpa/bin/hostapd/hostapd.8:1.1 src/external/bsd/wpa/bin/hostapd/hostapd.8:1.2
--- src/external/bsd/wpa/bin/hostapd/hostapd.8:1.1 Wed Aug 4 13:12:33 2010
+++ src/external/bsd/wpa/bin/hostapd/hostapd.8 Fri Mar 29 22:38:58 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: hostapd.8,v 1.1 2010/08/04 17:12:33 christos Exp $
+.\" $NetBSD: hostapd.8,v 1.2 2013/03/30 02:38:58 christos Exp $
.\"
.\" Copyright (c) 2005 Sam Leffler <[email protected]>
.\" All rights reserved.
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD: src/usr.sbin/wpa/hostapd/hostapd.8,v 1.2 2005/06/27 06:40:43 ru Exp $
.\"
-.Dd June 16, 2005
+.Dd March 21, 2013
.Dt HOSTAPD 8
.Os
.Sh NAME
@@ -107,9 +107,16 @@ Include key information in debugging out
.El
.Sh SEE ALSO
.Xr ath 4 ,
+.Xr athn 4 ,
+.Xr atw 4 ,
+.Xr awi 4 ,
+.Xr bwi 4 ,
.Xr ipw 4 ,
.Xr iwi 4 ,
.Xr ral 4 ,
+.Xr rtw 4 ,
+.Xr rum 4 ,
+.Xr run 4 , ???
.Xr wi 4 ,
.Xr hostapd.conf 5 ,
.Xr hostapd_cli 8 ,
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.596 src/share/man/man4/Makefile:1.597
--- src/share/man/man4/Makefile:1.596 Fri Mar 1 13:25:26 2013
+++ src/share/man/man4/Makefile Fri Mar 29 22:38:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.596 2013/03/01 18:25:26 joerg Exp $
+# $NetBSD: Makefile,v 1.597 2013/03/30 02:38:58 christos Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -8,7 +8,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a
aibs.4 alc.4 ale.4 alipm.4 altmem.4 altq.4 amdpm.4 amdtemp.4 amhphy.4 \
amr.4 aps.4 \
an.4 arcmsr.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \
- ath.4 atphy.4 atppc.4 attimer.4 atw.4 \
+ ath.4 athn.4 atphy.4 atppc.4 attimer.4 atw.4 \
auacer.4 audio.4 audiocs.4 auich.4 \
auixp.4 autri.4 auvia.4 awi.4 azalia.4 \
battery_pmu.4 bba.4 bce.4 bcsp.4 be.4 bge.4 bnx.4 bha.4 \
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.368 src/sys/arch/amd64/conf/GENERIC:1.369
--- src/sys/arch/amd64/conf/GENERIC:1.368 Fri Mar 1 21:42:08 2013
+++ src/sys/arch/amd64/conf/GENERIC Fri Mar 29 22:38:58 2013
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.368 2013/03/02 02:42:08 christos Exp $
+# $NetBSD: GENERIC,v 1.369 2013/03/30 02:38:58 christos Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.368 $"
+#ident "GENERIC-$Revision: 1.369 $"
maxusers 64 # estimated number of users
@@ -690,6 +690,7 @@ alc* at pci? dev ? function ? # Attansic
ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet
an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11
+athn* at pci? dev ? function ? # Atheros AR9k (802.11a/g/n) - UNTESTED
atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11)
bce* at pci? dev ? function ? # Broadcom 440x 10/100 Ethernet
bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
@@ -765,6 +766,7 @@ sm* at mhzc?
# CardBus network cards
ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11
+athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) - UNTESTED
atw* at cardbus? function ? # ADMtek ADM8211 (802.11)
ex* at cardbus? function ? # 3Com 3C575TX
fxp* at cardbus? function ? # Intel i8255x
@@ -961,6 +963,7 @@ ucom* at ukyopon? portno ?
uscanner* at uhub? port ?
# USB 802.11 adapters
+athn* at uhub? port ? # Atheros AR9002U
atu* at uhub? port ? # Atmel at76c50x 802.11b
otus* at uhub? port ? # Atheros AR9001U
ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1065 src/sys/conf/files:1.1066
--- src/sys/conf/files:1.1065 Fri Mar 1 13:25:55 2013
+++ src/sys/conf/files Fri Mar 29 22:38:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1065 2013/03/01 18:25:55 joerg Exp $
+# $NetBSD: files,v 1.1066 2013/03/30 02:38:59 christos Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -632,9 +632,9 @@ include "external/isc/atheros_hal/conf/f
# Atheros 5210/5211/5212 multi-mode 802.11
#
device ath: arp, wlan, ifnet
-file dev/ic/ath.c ath
-file dev/ic/ath_netbsd.c ath
-file dev/ic/athrate-sample.c ath
+file dev/ic/ath.c ath
+file dev/ic/ath_netbsd.c ath
+file dev/ic/athrate-sample.c ath
# ADMtek ADM8211 802.11
#
@@ -1779,3 +1779,15 @@ include "dev/nor/files.nor"
# iscsi
#
include "dev/iscsi/files.iscsi"
+
+# Atheros AR9k (802.11a/g/n) driver
+defflag opt_athn.h ATHN_DEBUG
+device athn: arp, ether, ifnet, wlan
+file dev/ic/athn.c athn
+file dev/ic/arn5008.c athn
+file dev/ic/arn5416.c athn
+file dev/ic/arn9003.c athn
+file dev/ic/arn9280.c athn
+file dev/ic/arn9285.c athn
+file dev/ic/arn9287.c athn
+file dev/ic/arn9380.c athn
Index: src/sys/dev/cardbus/files.cardbus
diff -u src/sys/dev/cardbus/files.cardbus:1.37 src/sys/dev/cardbus/files.cardbus:1.38
--- src/sys/dev/cardbus/files.cardbus:1.37 Sun Apr 8 16:49:29 2012
+++ src/sys/dev/cardbus/files.cardbus Fri Mar 29 22:38:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.cardbus,v 1.37 2012/04/08 20:49:29 christos Exp $
+# $NetBSD: files.cardbus,v 1.38 2013/03/30 02:38:59 christos Exp $
#
# files.cardbus
#
@@ -127,6 +127,12 @@ attach ath at cardbus with ath_cardbus
file dev/cardbus/if_ath_cardbus.c ath_cardbus
#
+# Atheros AR9k Wireless LAN
+#
+attach athn at cardbus with athn_cardbus
+file dev/cardbus/if_athn_cardbus.c athn_cardbus
+
+#
# Workbit NinjaSCSI-32 controllers
#
attach njs at cardbus with njs_cardbus
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.363 src/sys/dev/pci/files.pci:1.364
--- src/sys/dev/pci/files.pci:1.363 Wed Jan 30 14:08:53 2013
+++ src/sys/dev/pci/files.pci Fri Mar 29 22:38:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.363 2013/01/30 19:08:53 rkujawa Exp $
+# $NetBSD: files.pci,v 1.364 2013/03/30 02:38:59 christos Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -952,6 +952,10 @@ file dev/pci/if_vge.c vge
attach ath at pci with ath_pci
file dev/pci/if_ath_pci.c ath_pci
+# Atheros AR9k (802.11 a/g/n)
+attach athn at pci with athn_pci
+file dev/pci/if_athn_pci.c athn_pci
+
# NVIDIA nForce Ethernet
device nfe: ether, ifnet, arp, mii, mii_phy
attach nfe at pci
