From owner-svn-src-projects@FreeBSD.ORG Mon May 4 23:36:20 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id E57F6106566C;
Mon, 4 May 2009 23:36:20 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id C93D58FC18;
Mon, 4 May 2009 23:36:20 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n44NaKx5060944;
Mon, 4 May 2009 23:36:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n44NaK44060938;
Mon, 4 May 2009 23:36:20 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905042336.n44NaK44060938@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Mon, 4 May 2009 23:36:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191802 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 May 2009 23:36:21 -0000
Author: rpaulo
Date: Mon May 4 23:36:20 2009
New Revision: 191802
URL: http://svn.freebsd.org/changeset/base/191802
Log:
One more piece of the mesh link peering puzzle. The state machine is not
yet completely implemented and some timers need to be set.
While there, expert the peer id, local id and the link peering FSM to
user land.
Sponsored by: The FreeBSD Foundation
Modified:
projects/mesh11s/sys/net80211/ieee80211.h
projects/mesh11s/sys/net80211/ieee80211_ioctl.c
projects/mesh11s/sys/net80211/ieee80211_ioctl.h
projects/mesh11s/sys/net80211/ieee80211_mesh.c
projects/mesh11s/sys/net80211/ieee80211_node.h
projects/mesh11s/sys/net80211/ieee80211_output.c
Modified: projects/mesh11s/sys/net80211/ieee80211.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211.h Mon May 4 21:58:32 2009 (r191801)
+++ projects/mesh11s/sys/net80211/ieee80211.h Mon May 4 23:36:20 2009 (r191802)
@@ -902,16 +902,13 @@ enum {
/* values not yet allocated by ANA */
IEEE80211_REASON_PEER_LINK_CANCELED = 2, /* 11s */
IEEE80211_REASON_MESH_MAX_PEERS = 3, /* 11s */
- IEEE80211_REASON_MESH_CAP_POLICY_VIOLATION = 4, /* 11s */
+ IEEE80211_REASON_MESH_CPVIOLATION = 4, /* 11s */
IEEE80211_REASON_MESH_CLOSE_RCVD = 5, /* 11s */
IEEE80211_REASON_MESH_MAX_RETRIES = 6, /* 11s */
IEEE80211_REASON_MESH_CONFIRM_TIMEOUT = 7, /* 11s */
- IEEE80211_REASON_MESH_SEC_ROLE_NEG_DIFFERS = 8, /* 11s */
- IEEE80211_REASON_MESH_SEC_AUTH_IMPOSSIBLE = 9, /* 11s */
- IEEE80211_REASON_MESH_SEC_FAILED_VERIF = 10, /* 11s */
- IEEE80211_REASON_MESH_INVALID_GTK = 11, /* 11s */
- IEEE80211_REASON_MESH_MISMATCH_GTK = 12, /* 11s */
- IEEE80211_REASON_MESH_INCONSISTENT_PARAMS = 13, /* 11s */
+ IEEE80211_REASON_MESH_INVALID_GTK = 8, /* 11s */
+ IEEE80211_REASON_MESH_INCONS_PARAMS = 9, /* 11s */
+ IEEE80211_REASON_MESH_INVALID_SECURITY = 10, /* 11s */
IEEE80211_STATUS_SUCCESS = 0,
IEEE80211_STATUS_UNSPECIFIED = 1,
@@ -939,18 +936,6 @@ enum {
IEEE80211_STATUS_UNSUPP_RSN_IE_VERSION = 44, /* 11i */
IEEE80211_STATUS_INVALID_RSN_IE_CAP = 45, /* 11i */
IEEE80211_STATUS_CIPHER_SUITE_REJECTED = 46, /* 11i */
- /* values not yet allocated by ANA */
- IEEE80211_STATUS_PEER_LINK_ESTABLISHED = 14, /* 11s */
- IEEE80211_STATUS_PEER_LINK_CLOSED = 15, /* 11s */
- /* XXXRP: no identifiers for 16-17 */
- IEEE80211_STATUS_PEER_LINK_MAX_RETRIES = 18, /* 11s */
- IEEE80211_STATUS_PEER_LINK_NO_PMK = 19, /* 11s */
- IEEE80211_STATUS_PEER_LINK_ALT_PMK = 20, /* 11s */
- IEEE80211_STATUS_PEER_LINK_NO_AKM = 21, /* 11s */
- IEEE80211_STATUS_PEER_LINK_ALT_AKM = 22, /* 11s */
- IEEE80211_STATUS_PEER_LINK_NO_KDF = 23, /* 11s */
- IEEE80211_STATUS_PEER_LINK_SA_ESTABLISHED = 24, /* 11s */
- /* XXRP: no identifier for 25 */
};
#define IEEE80211_WEP_KEYLEN 5 /* 40bit */
Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_ioctl.c Mon May 4 21:58:32 2009 (r191801)
+++ projects/mesh11s/sys/net80211/ieee80211_ioctl.c Mon May 4 23:36:20 2009 (r191802)
@@ -441,6 +441,9 @@ get_sta_info(void *arg, struct ieee80211
else
si->isi_inact = vap->iv_inact_init;
si->isi_inact = (si->isi_inact - ni->ni_inact) * IEEE80211_INACT_WAIT;
+ si->isi_peerstate = ni->ni_peerstate;
+ si->isi_localid = ni->ni_llid;
+ si->isi_peerid = ni->ni_plid;
if (ielen) {
cp = ((uint8_t *)si) + si->isi_ie_off;
Modified: projects/mesh11s/sys/net80211/ieee80211_ioctl.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_ioctl.h Mon May 4 21:58:32 2009 (r191801)
+++ projects/mesh11s/sys/net80211/ieee80211_ioctl.h Mon May 4 23:36:20 2009 (r191802)
@@ -378,6 +378,10 @@ struct ieee80211req_sta_info {
uint16_t isi_txmbps; /* current tx rate in .5 Mb/s */
uint32_t isi_jointime; /* time of assoc/join */
struct ieee80211_mimo_info isi_mimo; /* MIMO info for 11n sta's */
+ /* 11s info */
+ uint8_t isi_peerstate;
+ uint16_t isi_peerid;
+ uint16_t isi_localid;
/* XXX frag state? */
/* variable length IE data */
};
Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c Mon May 4 21:58:32 2009 (r191801)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Mon May 4 23:36:20 2009 (r191802)
@@ -405,7 +405,21 @@ mesh_recv_mgmt(struct ieee80211_node *ni
* peered with this node, send him a mgmt frame with
* peer link IE.
*/
- /* XXX */
+ if (ni->ni_peerstate == IEEE80211_NODE_MESH_IDLE) {
+ uint16_t args[4];
+
+ get_random_bytes(&ni->ni_plid, 2);
+ ni->ni_peerstate = IEEE80211_NODE_MESH_OPENSNT;
+ IEEE80211_NOTE(vap,
+ IEEE80211_MSG_MESH,
+ ni, "peer link: switching to state %d",
+ ni->ni_peerstate);
+ args[0] = ni->ni_plid;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_OPEN, args);
+ /* XXX setup timeout1 */
+ }
break;
}
case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
@@ -562,34 +576,95 @@ mesh_recv_action(struct ieee80211_node *
case IEEE80211_ACTION_MESHPEERING_OPEN:
IEEE80211_NOTE(vap,
IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
- "%s", "recv peering open");
- ni->ni_peerstate = IEEE80211_NODE_MESH_OPENRCV;
- ni->ni_llid = meshpeer->peer_llinkid;
- ni->ni_plid = 0xf4ef;
- args[0] = ni->ni_plid;
- ieee80211_send_action(ni,
- IEEE80211_ACTION_CAT_MESHPEERING,
- IEEE80211_ACTION_MESHPEERING_OPEN, args);
+ "%s", "recv PEER OPEN");
+ switch (ni->ni_peerstate) {
+ case IEEE80211_NODE_MESH_IDLE:
+ ni->ni_peerstate = IEEE80211_NODE_MESH_OPENRCV;
+ IEEE80211_NOTE(vap,
+ IEEE80211_MSG_MESH,
+ ni, "peer link: switching to state %d",
+ ni->ni_peerstate);
+ ni->ni_llid = meshpeer->peer_llinkid;
+ get_random_bytes(&ni->ni_plid, 2);
+ args[0] = ni->ni_plid;
+ /* Announce we're open too... */
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_OPEN, args);
+ /* ... and confirm the link. */
+ args[0] = ni->ni_plid;
+ args[1] = ni->ni_llid;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_CONFIRM, args);
+ /* XXX setup timeout1 */
+ break;
+ case IEEE80211_NODE_MESH_OPENRCV:
+ /* We received a duplicate open, confirm again. */
+ ni->ni_llid = meshpeer->peer_llinkid;
+ args[0] = ni->ni_plid;
+ args[1] = ni->ni_llid;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_CONFIRM, args);
+ break;
+ case IEEE80211_NODE_MESH_OPENSNT:
+ ni->ni_peerstate = IEEE80211_NODE_MESH_OPENRCV;
+ IEEE80211_NOTE(vap,
+ IEEE80211_MSG_MESH,
+ ni, "peer link: switching to state %d",
+ ni->ni_peerstate);
+ args[0] = ni->ni_plid;
+ args[1] = ni->ni_llid;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_CONFIRM, args);
+ /* XXX setup timeout1 */
+ break;
+ case IEEE80211_NODE_MESH_CONFIRMRECV:
+ ni->ni_peerstate = IEEE80211_NODE_MESH_ESTABLISHED;
+ IEEE80211_NOTE(vap,
+ IEEE80211_MSG_MESH,
+ ni, "peer link: switching to state %d",
+ ni->ni_peerstate);
+ ni->ni_llid = meshpeer->peer_llinkid;
+ args[0] = ni->ni_plid;
+ args[1] = ni->ni_llid;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_CONFIRM, args);
+ /* clear timeoutC */
+ break;
+ }
break;
case IEEE80211_ACTION_MESHPEERING_CONFIRM:
IEEE80211_NOTE(vap,
IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
- "%s", "recv peering confirm");
- if (ni->ni_peerstate != IEEE80211_NODE_MESH_OPNSENT &&
- ni->ni_peerstate != IEEE80211_NODE_MESH_OPENRCV) {
+ "%s", "recv PEER CONFIRM");
+ switch (ni->ni_peerstate) {
+ case IEEE80211_NODE_MESH_OPENRCV:
+ ni->ni_peerstate = IEEE80211_NODE_MESH_ESTABLISHED;
+ IEEE80211_NOTE(vap,
+ IEEE80211_MSG_MESH,
+ ni, "peer link: switching to state %d",
+ ni->ni_peerstate);
+ /* clear timeoutR */
+ break;
+ case IEEE80211_NODE_MESH_OPENSNT:
+ ni->ni_peerstate = IEEE80211_NODE_MESH_CONFIRMRECV;
+ IEEE80211_NOTE(vap,
+ IEEE80211_MSG_MESH,
+ ni, "peer link: switching to state %d",
+ ni->ni_peerstate);
+ break;
+ default:
+
IEEE80211_DISCARD(vap,
IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
wh, NULL, "received confirm in invalid "
"state %d", ni->ni_peerstate);
vap->iv_stats.is_rx_mgtdiscard++;
- return;
}
- ni->ni_peerstate = IEEE80211_NODE_MESH_CONFIRMRECV;
- args[0] = 0xf4ef;
- args[1] = ni->ni_llid;
- ieee80211_send_action(ni,
- IEEE80211_ACTION_CAT_MESHPEERING,
- IEEE80211_ACTION_MESHPEERING_CONFIRM, args);
}
break;
default:
@@ -688,6 +763,7 @@ ieee80211_add_meshpeer(uint8_t *frm, uin
*frm++ = 7; /* length */
else
*frm++ = 5; /* length */
+ *frm++ = subtype;
ADDSHORT(frm, localid); /* local ID */
if (peerid)
ADDSHORT(frm, peerid); /* peer ID */
Modified: projects/mesh11s/sys/net80211/ieee80211_node.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_node.h Mon May 4 21:58:32 2009 (r191801)
+++ projects/mesh11s/sys/net80211/ieee80211_node.h Mon May 4 23:36:20 2009 (r191802)
@@ -175,9 +175,9 @@ struct ieee80211_node {
uint8_t ni_dtim_period; /* DTIM period */
uint8_t ni_dtim_count; /* DTIM count for last bcn */
- /* mesh */
+ /* 11s state */
#define IEEE80211_NODE_MESH_IDLE 0
-#define IEEE80211_NODE_MESH_OPNSENT 1 /* Peer Open Frame Received */
+#define IEEE80211_NODE_MESH_OPENSNT 1 /* Peer Open Frame Received */
#define IEEE80211_NODE_MESH_OPENRCV 2 /* Peer Open Frame Sent */
#define IEEE80211_NODE_MESH_CONFIRMRECV 3 /* Peer Confirm Frame Recvived */
#define IEEE80211_NODE_MESH_ESTABLISHED 4 /* Peer Link Established */
Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c Mon May 4 21:58:32 2009 (r191801)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c Mon May 4 23:36:20 2009 (r191802)
@@ -691,6 +691,17 @@ ieee80211_send_action(struct ieee80211_n
IEEE80211_MESH_PEER_LINK_CONFIRM, args[0], args[1],
0);
break;
+ case IEEE80211_ACTION_MESHPEERING_CLOSE:
+ IEEE80211_NOTE(vap,
+ IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
+ "sending PEER CLOSE action: localid %x peerid %x "
+ "reason %d", args[0], args[1], args[2]);
+ ADDSHORT(frm, args[2]); /* reason code */
+ frm = ieee80211_add_meshid(frm, vap);
+ frm = ieee80211_add_meshpeer(frm,
+ IEEE80211_MESH_PEER_LINK_CLOSE, args[0], args[1],
+ args[2]);
+ break;
}
break;
default:
From owner-svn-src-projects@FreeBSD.ORG Wed May 6 00:31:34 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 26614106564A;
Wed, 6 May 2009 00:31:34 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 1313D8FC1D;
Wed, 6 May 2009 00:31:34 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n460VX6u098525;
Wed, 6 May 2009 00:31:33 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n460VXeD098524;
Wed, 6 May 2009 00:31:33 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905060031.n460VXeD098524@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 6 May 2009 00:31:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191835 - projects/mesh11s/lib/libc/arm/string
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 00:31:35 -0000
Author: rpaulo
Date: Wed May 6 00:31:33 2009
New Revision: 191835
URL: http://svn.freebsd.org/changeset/base/191835
Log:
Backout latest revision. Makes arm bootable.
Modified:
projects/mesh11s/lib/libc/arm/string/strncmp.S
Modified: projects/mesh11s/lib/libc/arm/string/strncmp.S
==============================================================================
--- projects/mesh11s/lib/libc/arm/string/strncmp.S Tue May 5 20:54:26 2009 (r191834)
+++ projects/mesh11s/lib/libc/arm/string/strncmp.S Wed May 6 00:31:33 2009 (r191835)
@@ -33,10 +33,10 @@
__FBSDID("$FreeBSD$");
ENTRY(strncmp)
-/* if (len == 0) return 0 */
- cmp r2, #0
- moveq r0, #0
- RETeq
+/* if ((len - 1) < 0) return 0 */
+ subs r2, r2, #1
+ movmi r0, #0
+ movmi pc, lr
/* ip == last src address to compare */
add ip, r0, r2
From owner-svn-src-projects@FreeBSD.ORG Wed May 6 02:31:08 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 4C08C1065677;
Wed, 6 May 2009 02:31:08 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 30D1E8FC26;
Wed, 6 May 2009 02:31:08 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n462V8Jj001267;
Wed, 6 May 2009 02:31:08 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n462V8JN001265;
Wed, 6 May 2009 02:31:08 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200905060231.n462V8JN001265@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 6 May 2009 02:31:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191837 - projects/mips/sys/mips/atheros
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 02:31:08 -0000
Author: gonzo
Date: Wed May 6 02:31:07 2009
New Revision: 191837
URL: http://svn.freebsd.org/changeset/base/191837
Log:
- Handle memory requests on apb level, do not pass them up to
nexus
- Unmask IRQ in bus_intr_setup
- Do not count timer IRQ (IRQ0) as stray
Modified:
projects/mips/sys/mips/atheros/apb.c
projects/mips/sys/mips/atheros/apbvar.h
Modified: projects/mips/sys/mips/atheros/apb.c
==============================================================================
--- projects/mips/sys/mips/atheros/apb.c Wed May 6 01:50:04 2009 (r191836)
+++ projects/mips/sys/mips/atheros/apb.c Wed May 6 02:31:07 2009 (r191837)
@@ -101,6 +101,16 @@ apb_attach(device_t dev)
int rid = 0;
device_set_desc(dev, "APB Bus bridge");
+
+ sc->apb_mem_rman.rm_type = RMAN_ARRAY;
+ sc->apb_mem_rman.rm_descr = "APB memory window";
+
+ if (rman_init(&sc->apb_mem_rman) != 0 ||
+ rman_manage_region(&sc->apb_mem_rman,
+ AR71XX_APB_BASE,
+ AR71XX_APB_BASE + AR71XX_APB_SIZE - 1) != 0)
+ panic("apb_attach: failed to set up memory rman");
+
sc->apb_irq_rman.rm_type = RMAN_ARRAY;
sc->apb_irq_rman.rm_descr = "APB IRQ";
@@ -145,18 +155,19 @@ apb_alloc_resource(device_t bus, device_
/*
* Pass memory requests to nexus device
*/
- passthrough = (device_get_parent(child) != bus) ||
- (type == SYS_RES_MEMORY);
+ passthrough = (device_get_parent(child) != bus);
rle = NULL;
- dprintf("%s: entry (%p, %p, %d, %p, %p, %p, %ld, %d)\n",
- __func__, bus, child, type, rid, (void *)(intptr_t)start,
+ dprintf("%s: entry (%p, %p, %d, %d, %p, %p, %ld, %d)\n",
+ __func__, bus, child, type, *rid, (void *)(intptr_t)start,
(void *)(intptr_t)end, count, flags);
if (passthrough)
return (BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type,
rid, start, end, count, flags));
+ printf("not pass through\n");
+
/*
* If this is an allocation of the "default" range for a given RID,
* and we know what the resources for this device are (ie. they aren't
@@ -185,6 +196,9 @@ apb_alloc_resource(device_t bus, device_
case SYS_RES_IRQ:
rm = &sc->apb_irq_rman;
break;
+ case SYS_RES_MEMORY:
+ rm = &sc->apb_mem_rman;
+ break;
default:
printf("%s: unknown resource type %d\n", __func__, type);
return (0);
@@ -275,6 +289,8 @@ apb_setup_intr(device_t bus, device_t ch
intr_event_add_handler(event, device_get_nameunit(child), filt,
handler, arg, intr_priority(flags), flags, cookiep);
+ apb_unmask_irq(irq);
+
return (0);
}
@@ -313,7 +329,9 @@ apb_intr(void *arg)
if (reg & (1 << irq)) {
event = sc->sc_eventstab[irq];
if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
- printf("Stray IRQ %d\n", irq);
+ /* Ignore timer interrupts */
+ if (irq != 0)
+ printf("Stray IRQ %d\n", irq);
continue;
}
Modified: projects/mips/sys/mips/atheros/apbvar.h
==============================================================================
--- projects/mips/sys/mips/atheros/apbvar.h Wed May 6 01:50:04 2009 (r191836)
+++ projects/mips/sys/mips/atheros/apbvar.h Wed May 6 02:31:07 2009 (r191837)
@@ -34,6 +34,7 @@
struct apb_softc {
struct rman apb_irq_rman;
+ struct rman apb_mem_rman;
/* IRQ events structs for child devices */
struct intr_event *sc_eventstab[APB_NIRQS];
/* Resources and cookies for MIPS CPU INTs */
From owner-svn-src-projects@FreeBSD.ORG Wed May 6 02:31:47 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 37A6F1065678;
Wed, 6 May 2009 02:31:47 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 1F95C8FC19;
Wed, 6 May 2009 02:31:47 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n462VlsI001313;
Wed, 6 May 2009 02:31:47 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n462VlLM001312;
Wed, 6 May 2009 02:31:47 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200905060231.n462VlLM001312@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 6 May 2009 02:31:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191838 - projects/mips/sys/mips/atheros
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 02:31:47 -0000
Author: gonzo
Date: Wed May 6 02:31:46 2009
New Revision: 191838
URL: http://svn.freebsd.org/changeset/base/191838
Log:
- Add APB base and size for memory rman in apb
Modified:
projects/mips/sys/mips/atheros/ar71xxreg.h
Modified: projects/mips/sys/mips/atheros/ar71xxreg.h
==============================================================================
--- projects/mips/sys/mips/atheros/ar71xxreg.h Wed May 6 02:31:07 2009 (r191837)
+++ projects/mips/sys/mips/atheros/ar71xxreg.h Wed May 6 02:31:46 2009 (r191838)
@@ -60,6 +60,15 @@
#define AR71XX_PCI_AHB_ERROR_ADDR 0x17010028
/* APB region */
+/*
+ * Size is not really true actual APB window size is
+ * 0x01000000 but it should handle OHCI memory as well
+ * because this controller's interrupt is routed through
+ * APB.
+ */
+#define AR71XX_APB_BASE 0x18000000
+#define AR71XX_APB_SIZE 0x06000000
+
/* DDR registers */
#define AR71XX_DDR_CONFIG 0x18000000
#define AR71XX_DDR_CONFIG2 0x18000004
From owner-svn-src-projects@FreeBSD.ORG Wed May 6 02:34:35 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B8B04106566B;
Wed, 6 May 2009 02:34:35 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id A7D728FC0A;
Wed, 6 May 2009 02:34:35 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n462YZEw001409;
Wed, 6 May 2009 02:34:35 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n462YZhR001408;
Wed, 6 May 2009 02:34:35 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200905060234.n462YZhR001408@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 6 May 2009 02:34:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191839 - projects/mips/sys/mips/conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 02:34:36 -0000
Author: gonzo
Date: Wed May 6 02:34:35 2009
New Revision: 191839
URL: http://svn.freebsd.org/changeset/base/191839
Log:
- Rollback to legacy NFS RPC implementation. New one has unaligned
memory access after nfsm_dissect
Modified:
projects/mips/sys/mips/conf/AR71XX
Modified: projects/mips/sys/mips/conf/AR71XX
==============================================================================
--- projects/mips/sys/mips/conf/AR71XX Wed May 6 02:31:46 2009 (r191838)
+++ projects/mips/sys/mips/conf/AR71XX Wed May 6 02:34:35 2009 (r191839)
@@ -25,6 +25,7 @@ options NFS_ROOT #NFS usable as /, req
options PSEUDOFS #Pseudo-filesystem framework
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options NFS_LEGACYRPC
# Debugging for use in -current
options INVARIANTS
options INVARIANT_SUPPORT
From owner-svn-src-projects@FreeBSD.ORG Wed May 6 02:46:05 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B357F1065675;
Wed, 6 May 2009 02:46:05 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id A1F028FC08;
Wed, 6 May 2009 02:46:05 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n462k5gK001740;
Wed, 6 May 2009 02:46:05 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n462k4aZ001738;
Wed, 6 May 2009 02:46:04 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200905060246.n462k4aZ001738@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 6 May 2009 02:46:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191840 - in projects/mips/sys/mips: atheros conf
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 02:46:06 -0000
Author: gonzo
Date: Wed May 6 02:46:04 2009
New Revision: 191840
URL: http://svn.freebsd.org/changeset/base/191840
Log:
- Rollback to the hack with 3-bytes offset in base address.
uart_bus_XXXXX resources are handled in uart(4) code
and we need more sophysticated way to define which space
should be used for device based on hints
Modified:
projects/mips/sys/mips/atheros/uart_bus_ar71xx.c
projects/mips/sys/mips/conf/AR71XX.hints
Modified: projects/mips/sys/mips/atheros/uart_bus_ar71xx.c
==============================================================================
--- projects/mips/sys/mips/atheros/uart_bus_ar71xx.c Wed May 6 02:34:35 2009 (r191839)
+++ projects/mips/sys/mips/atheros/uart_bus_ar71xx.c Wed May 6 02:46:04 2009 (r191840)
@@ -72,6 +72,12 @@ uart_ar71xx_probe(device_t dev)
sc->sc_sysdev = SLIST_FIRST(&uart_sysdevs);
sc->sc_class = &uart_ns8250_class;
bcopy(&sc->sc_sysdev->bas, &sc->sc_bas, sizeof(sc->sc_bas));
+ sc->sc_sysdev->bas.regshft = 2;
+ sc->sc_sysdev->bas.bst = mips_bus_space_generic;
+ sc->sc_sysdev->bas.bsh = MIPS_PHYS_TO_KSEG1(AR71XX_UART_ADDR) + 3;
+ sc->sc_bas.regshft = 2;
+ sc->sc_bas.bst = mips_bus_space_generic;
+ sc->sc_bas.bsh = MIPS_PHYS_TO_KSEG1(AR71XX_UART_ADDR) + 3;
return (uart_bus_probe(dev, 2, 85000000, 0, 0));
}
Modified: projects/mips/sys/mips/conf/AR71XX.hints
==============================================================================
--- projects/mips/sys/mips/conf/AR71XX.hints Wed May 6 02:34:35 2009 (r191839)
+++ projects/mips/sys/mips/conf/AR71XX.hints Wed May 6 02:46:04 2009 (r191840)
@@ -1,13 +1,11 @@
# $FreeBSD$
hint.apb.0.at="nexus0"
-hint.apb.0.maddr=0x18000000
-hint.apb.0.msize=0x06000000
hint.apb.0.irq=4
# uart0
hint.uart.0.at="apb0"
# see atheros/uart_cpu_ar71xx.c why +3
-hint.uart.0.maddr=0x18020000
+hint.uart.0.maddr=0x18020003
hint.uart.0.msize=0x18
hint.uart.0.irq=3
From owner-svn-src-projects@FreeBSD.ORG Wed May 6 02:55:44 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 341AA1065690;
Wed, 6 May 2009 02:55:44 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 088E28FC1E;
Wed, 6 May 2009 02:55:44 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n462thao001944;
Wed, 6 May 2009 02:55:43 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n462thjn001943;
Wed, 6 May 2009 02:55:43 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200905060255.n462thjn001943@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 6 May 2009 02:55:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191841 - projects/mips/sys/mips/mips
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 02:55:44 -0000
Author: gonzo
Date: Wed May 6 02:55:43 2009
New Revision: 191841
URL: http://svn.freebsd.org/changeset/base/191841
Log:
- Use index ops in order to avoid TLBMiss exceptions when flushing caches
on mapping removal
- Writeback all VA for page that is being copied in pmap_copy_page to
guaranty up-to-date data in SDRAM
Modified:
projects/mips/sys/mips/mips/pmap.c
Modified: projects/mips/sys/mips/mips/pmap.c
==============================================================================
--- projects/mips/sys/mips/mips/pmap.c Wed May 6 02:46:04 2009 (r191840)
+++ projects/mips/sys/mips/mips/pmap.c Wed May 6 02:55:43 2009 (r191841)
@@ -187,6 +187,7 @@ static int init_pte_prot(vm_offset_t va,
static void pmap_TLB_invalidate_kernel(vm_offset_t);
static void pmap_TLB_update_kernel(vm_offset_t, pt_entry_t);
static void pmap_init_fpage(void);
+static void pmap_flush_pvcache(vm_page_t m);
#ifdef SMP
static void pmap_invalidate_page_action(void *arg);
@@ -702,7 +703,7 @@ pmap_kremove(vm_offset_t va)
/*
* Write back all caches from the page being destroyed
*/
- mips_dcache_wbinv_range(va, NBPG);
+ mips_dcache_wbinv_range_index(va, NBPG);
pte = pmap_pte(kernel_pmap, va);
*pte = PTE_G;
@@ -1532,7 +1533,7 @@ pmap_remove_page(struct pmap *pmap, vm_o
/*
* Write back all caches from the page being destroyed
*/
- mips_dcache_wbinv_range(va, NBPG);
+ mips_dcache_wbinv_range_index(va, NBPG);
/*
* get a local va for mappings for this pmap.
@@ -1625,7 +1626,7 @@ pmap_remove_all(vm_page_t m)
* the page being destroyed
*/
if (m->md.pv_list_count == 1)
- mips_dcache_wbinv_range(pv->pv_va, NBPG);
+ mips_dcache_wbinv_range_index(pv->pv_va, NBPG);
pv->pv_pmap->pm_stats.resident_count--;
@@ -2373,7 +2374,6 @@ pmap_copy_page(vm_page_t src, vm_page_t
vm_paddr_t phy_src = VM_PAGE_TO_PHYS(src);
vm_paddr_t phy_dst = VM_PAGE_TO_PHYS(dst);
-
#ifdef VM_ALLOC_WIRED_TLB_PG_POOL
if (need_wired_tlb_page_pool) {
struct fpage *fp1, *fp2;
@@ -2403,9 +2403,14 @@ pmap_copy_page(vm_page_t src, vm_page_t
#endif
{
if ((phy_src < MIPS_KSEG0_LARGEST_PHYS) && (phy_dst < MIPS_KSEG0_LARGEST_PHYS)) {
- /* easy case, all can be accessed via KSEG0 */
- va_src = MIPS_PHYS_TO_CACHED(phy_src);
- va_dst = MIPS_PHYS_TO_CACHED(phy_dst);
+ /* easy case, all can be accessed via KSEG1 */
+ /*
+ * Flush all caches for VA that are mapped to this page
+ * to make sure that data in SDRAM is up to date
+ */
+ pmap_flush_pvcache(src);
+ va_src = MIPS_PHYS_TO_UNCACHED(phy_src);
+ va_dst = MIPS_PHYS_TO_UNCACHED(phy_dst);
bcopy((caddr_t)va_src, (caddr_t)va_dst, PAGE_SIZE);
} else {
int cpu;
@@ -3291,3 +3296,16 @@ pmap_kextract(vm_offset_t va)
}
return pa;
}
+
+static void
+pmap_flush_pvcache(vm_page_t m)
+{
+ pv_entry_t pv;
+
+ if (m != NULL) {
+ for (pv = TAILQ_FIRST(&m->md.pv_list); pv;
+ pv = TAILQ_NEXT(pv, pv_list)) {
+ mips_dcache_wbinv_range_index(pv->pv_va, NBPG);
+ }
+ }
+}
From owner-svn-src-projects@FreeBSD.ORG Wed May 6 18:27:12 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id D898C106566C;
Wed, 6 May 2009 18:27:12 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id C7EB68FC08;
Wed, 6 May 2009 18:27:12 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n46IRCjB026018;
Wed, 6 May 2009 18:27:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n46IRCJ3026016;
Wed, 6 May 2009 18:27:12 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905061827.n46IRCJ3026016@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 6 May 2009 18:27:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191851 - projects/mesh11s/sys/dev/ath
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 18:27:13 -0000
Author: rpaulo
Date: Wed May 6 18:27:12 2009
New Revision: 191851
URL: http://svn.freebsd.org/changeset/base/191851
Log:
Add a few more MBSS handling cases.
Sponsored by: The FreeBSD Foundation
Modified:
projects/mesh11s/sys/dev/ath/if_ath.c
Modified: projects/mesh11s/sys/dev/ath/if_ath.c
==============================================================================
--- projects/mesh11s/sys/dev/ath/if_ath.c Wed May 6 18:24:56 2009 (r191850)
+++ projects/mesh11s/sys/dev/ath/if_ath.c Wed May 6 18:27:12 2009 (r191851)
@@ -883,9 +883,11 @@ ath_vap_create(struct ieee80211com *ic,
ic_opmode = opmode;
break;
case IEEE80211_M_IBSS:
+ case IEEE80211_M_MBSS:
if (sc->sc_nvaps != 0) { /* XXX only 1 for now */
device_printf(sc->sc_dev,
- "only 1 ibss vap supported\n");
+ "only 1 %s vap supported\n",
+ (opmode == IEEE80211_M_IBSS) ? "ibss" : "mbss");
goto bad;
}
ic_opmode = opmode;
@@ -924,11 +926,6 @@ ath_vap_create(struct ieee80211com *ic,
flags &= ~IEEE80211_CLONE_BSSID;
}
ic_opmode = IEEE80211_M_HOSTAP;
- break;
- case IEEE80211_M_MBSS:
- ic_opmode = IEEE80211_M_IBSS;
- /* XXXRP TBD */
- break;
default:
device_printf(sc->sc_dev, "unknown opmode %d\n", opmode);
goto bad;
@@ -1034,6 +1031,7 @@ ath_vap_create(struct ieee80211com *ic,
/* fall thru... */
#endif
case IEEE80211_M_HOSTAP:
+ case IEEE80211_M_MBSS:
sc->sc_opmode = HAL_M_HOSTAP;
break;
case IEEE80211_M_MONITOR:
@@ -5609,6 +5607,7 @@ ath_newstate(struct ieee80211vap *vap, e
#endif
case IEEE80211_M_HOSTAP:
case IEEE80211_M_IBSS:
+ case IEEE80211_M_MBSS:
/*
* Allocate and setup the beacon frame.
*
From owner-svn-src-projects@FreeBSD.ORG Wed May 6 20:48:45 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id A08C61065678;
Wed, 6 May 2009 20:48:45 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 8EE618FC17;
Wed, 6 May 2009 20:48:45 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n46KmjJ1029431;
Wed, 6 May 2009 20:48:45 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n46Kmjl9029429;
Wed, 6 May 2009 20:48:45 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905062048.n46Kmjl9029429@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Wed, 6 May 2009 20:48:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191859 - projects/mesh11s/sys/dev/ath
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 20:48:46 -0000
Author: rpaulo
Date: Wed May 6 20:48:45 2009
New Revision: 191859
URL: http://svn.freebsd.org/changeset/base/191859
Log:
Prepare beacons in MBSS mode too.
Sponsored by: The FreeBSD Foundation
Modified:
projects/mesh11s/sys/dev/ath/if_ath.c
Modified: projects/mesh11s/sys/dev/ath/if_ath.c
==============================================================================
--- projects/mesh11s/sys/dev/ath/if_ath.c Wed May 6 20:24:17 2009 (r191858)
+++ projects/mesh11s/sys/dev/ath/if_ath.c Wed May 6 20:48:45 2009 (r191859)
@@ -3213,10 +3213,12 @@ ath_beacon_config(struct ath_softc *sc,
} while (nexttbtt < tsftu);
}
ath_beaconq_config(sc);
- } else if (ic->ic_opmode == IEEE80211_M_HOSTAP) {
+ } else if (ic->ic_opmode == IEEE80211_M_HOSTAP ||
+ ic->ic_opmode == IEEE80211_M_MBSS) {
/*
- * In AP mode we enable the beacon timers and
- * SWBA interrupts to prepare beacon frames.
+ * In AP mode and mesh mode we enable the beacon
+ * timers and * SWBA interrupts to prepare beacon
+ * frames.
*/
intval |= HAL_BEACON_ENA;
sc->sc_imask |= HAL_INT_SWBA; /* beacon prepare */
From owner-svn-src-projects@FreeBSD.ORG Wed May 6 22:40:03 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 89A6D106570C;
Wed, 6 May 2009 22:40:03 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 63AF58FC2C;
Wed, 6 May 2009 22:40:03 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n46Me3xX032128;
Wed, 6 May 2009 22:40:03 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n46Me2Sn032112;
Wed, 6 May 2009 22:40:02 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200905062240.n46Me2Sn032112@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Wed, 6 May 2009 22:40:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191863 - in projects/mips: . bin/ls bin/rm bin/sh
contrib/amd/m4 contrib/bind contrib/bind9
contrib/bind9/lib/dns/sec contrib/cpio contrib/csup
contrib/cvs/tools/pcl-cvs contrib/file c...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 May 2009 22:40:05 -0000
Author: gonzo
Date: Wed May 6 22:40:01 2009
New Revision: 191863
URL: http://svn.freebsd.org/changeset/base/191863
Log:
Merge from HEAD
Added:
projects/mips/contrib/file/Magdir/wireless
- copied unchanged from r191859, head/contrib/file/Magdir/wireless
projects/mips/contrib/file/Makefile.am-src
- copied unchanged from r191859, head/contrib/file/Makefile.am-src
projects/mips/contrib/file/cdf.c
- copied unchanged from r191859, head/contrib/file/cdf.c
projects/mips/contrib/file/cdf.h
- copied unchanged from r191859, head/contrib/file/cdf.h
projects/mips/contrib/file/cdf_time.c
- copied unchanged from r191859, head/contrib/file/cdf_time.c
projects/mips/contrib/file/encoding.c
- copied unchanged from r191859, head/contrib/file/encoding.c
projects/mips/contrib/file/readcdf.c
- copied unchanged from r191859, head/contrib/file/readcdf.c
projects/mips/contrib/openbsm/libbsm/au_fcntl_cmd.3
- copied unchanged from r191859, head/contrib/openbsm/libbsm/au_fcntl_cmd.3
projects/mips/contrib/openbsm/libbsm/bsm_fcntl.c
- copied unchanged from r191859, head/contrib/openbsm/libbsm/bsm_fcntl.c
projects/mips/contrib/openbsm/sys/bsm/audit_fcntl.h
- copied unchanged from r191859, head/contrib/openbsm/sys/bsm/audit_fcntl.h
projects/mips/lib/libarchive/archive_read_support_compression_xz.c
- copied unchanged from r191859, head/lib/libarchive/archive_read_support_compression_xz.c
projects/mips/lib/libarchive/archive_read_support_format_raw.c
- copied unchanged from r191859, head/lib/libarchive/archive_read_support_format_raw.c
projects/mips/lib/libarchive/archive_write_set_compression_xz.c
- copied unchanged from r191859, head/lib/libarchive/archive_write_set_compression_xz.c
projects/mips/lib/libarchive/test/test_compat_solaris_tar_acl.c
- copied unchanged from r191859, head/lib/libarchive/test/test_compat_solaris_tar_acl.c
projects/mips/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu
- copied unchanged from r191859, head/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu
projects/mips/lib/libarchive/test/test_compat_xz.c
- copied unchanged from r191859, head/lib/libarchive/test/test_compat_xz.c
projects/mips/lib/libarchive/test/test_compat_xz_1.txz.uu
- copied unchanged from r191859, head/lib/libarchive/test/test_compat_xz_1.txz.uu
projects/mips/lib/libarchive/test/test_open_fd.c
- copied unchanged from r191859, head/lib/libarchive/test/test_open_fd.c
projects/mips/lib/libarchive/test/test_open_file.c
- copied unchanged from r191859, head/lib/libarchive/test/test_open_file.c
projects/mips/lib/libarchive/test/test_open_filename.c
- copied unchanged from r191859, head/lib/libarchive/test/test_open_filename.c
projects/mips/lib/libarchive/test/test_read_disk_entry_from_file.c
- copied unchanged from r191859, head/lib/libarchive/test/test_read_disk_entry_from_file.c
projects/mips/lib/libarchive/test/test_read_format_cpio_bin_be.c
- copied unchanged from r191859, head/lib/libarchive/test/test_read_format_cpio_bin_be.c
projects/mips/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu
- copied unchanged from r191859, head/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu
projects/mips/lib/libarchive/test/test_read_format_cpio_bin_xz.c
- copied unchanged from r191859, head/lib/libarchive/test/test_read_format_cpio_bin_xz.c
projects/mips/lib/libarchive/test/test_read_format_gtar_lzma.c
- copied unchanged from r191859, head/lib/libarchive/test/test_read_format_gtar_lzma.c
projects/mips/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu
- copied unchanged from r191859, head/lib/libarchive/test/test_read_format_iso_gz.iso.gz.uu
projects/mips/lib/libarchive/test/test_read_format_raw.c
- copied unchanged from r191859, head/lib/libarchive/test/test_read_format_raw.c
projects/mips/lib/libarchive/test/test_read_format_raw.data.Z.uu
- copied unchanged from r191859, head/lib/libarchive/test/test_read_format_raw.data.Z.uu
projects/mips/lib/libarchive/test/test_read_format_raw.data.uu
- copied unchanged from r191859, head/lib/libarchive/test/test_read_format_raw.data.uu
projects/mips/lib/libarchive/test/test_read_format_txz.c
- copied unchanged from r191859, head/lib/libarchive/test/test_read_format_txz.c
projects/mips/lib/libarchive/test/test_write_compress_bzip2.c
- copied unchanged from r191859, head/lib/libarchive/test/test_write_compress_bzip2.c
projects/mips/lib/libarchive/test/test_write_compress_gzip.c
- copied unchanged from r191859, head/lib/libarchive/test/test_write_compress_gzip.c
projects/mips/lib/libarchive/test/test_write_compress_lzma.c
- copied unchanged from r191859, head/lib/libarchive/test/test_write_compress_lzma.c
projects/mips/lib/libarchive/test/test_write_compress_xz.c
- copied unchanged from r191859, head/lib/libarchive/test/test_write_compress_xz.c
projects/mips/lib/libarchive/test/test_write_format_mtree.c
- copied unchanged from r191859, head/lib/libarchive/test/test_write_format_mtree.c
projects/mips/share/man/man4/man4.powerpc/tsec.4
- copied unchanged from r191859, head/share/man/man4/man4.powerpc/tsec.4
projects/mips/sys/arm/at91/at91_cfata.c
- copied unchanged from r191859, head/sys/arm/at91/at91_cfata.c
projects/mips/sys/bsm/audit_fcntl.h
- copied unchanged from r191859, head/sys/bsm/audit_fcntl.h
projects/mips/sys/dev/bwi/
- copied from r191859, head/sys/dev/bwi/
projects/mips/sys/fs/nfs/
- copied from r191859, head/sys/fs/nfs/
projects/mips/sys/fs/nfsclient/
- copied from r191859, head/sys/fs/nfsclient/
projects/mips/sys/fs/nfsserver/
- copied from r191859, head/sys/fs/nfsserver/
projects/mips/sys/modules/bwi/
- copied from r191859, head/sys/modules/bwi/
projects/mips/sys/net/flowtable.c
- copied unchanged from r191859, head/sys/net/flowtable.c
projects/mips/sys/net/flowtable.h
- copied unchanged from r191859, head/sys/net/flowtable.h
projects/mips/sys/net/if_dead.c
- copied unchanged from r191859, head/sys/net/if_dead.c
projects/mips/sys/netinet6/in6_mcast.c
- copied unchanged from r191859, head/sys/netinet6/in6_mcast.c
projects/mips/sys/netinet6/mld6.h
- copied unchanged from r191859, head/sys/netinet6/mld6.h
projects/mips/sys/powerpc/mpc85xx/atpic.c
- copied unchanged from r191859, head/sys/powerpc/mpc85xx/atpic.c
projects/mips/sys/powerpc/mpc85xx/isa.c
- copied unchanged from r191859, head/sys/powerpc/mpc85xx/isa.c
projects/mips/sys/security/audit/audit_bsm_fcntl.c
- copied unchanged from r191859, head/sys/security/audit/audit_bsm_fcntl.c
projects/mips/tools/regression/bin/sh/parser/
- copied from r191859, head/tools/regression/bin/sh/parser/
projects/mips/tools/tools/nanobsd/fill_pkg.sh
- copied unchanged from r191859, head/tools/tools/nanobsd/fill_pkg.sh
Deleted:
projects/mips/contrib/amd/m4/
projects/mips/contrib/bind/
projects/mips/contrib/bind9/lib/dns/sec/
projects/mips/contrib/cvs/tools/pcl-cvs/
projects/mips/contrib/file/.cvsignore
projects/mips/contrib/file/FREEBSD-upgrade
projects/mips/contrib/gcc/config/alpha/
projects/mips/contrib/gcc/config/frv/
projects/mips/contrib/gcc/config/mpw/
projects/mips/contrib/gcc/contrib/
projects/mips/contrib/gcc/f/
projects/mips/contrib/gcc/include/
projects/mips/contrib/gdb/gdb/config/none/
projects/mips/contrib/gdb/gdb/nlm/
projects/mips/contrib/groff/addftinfo/
projects/mips/contrib/groff/afmtodit/
projects/mips/contrib/groff/eqn/
projects/mips/contrib/groff/grn/
projects/mips/contrib/groff/grodvi/
projects/mips/contrib/groff/groff/
projects/mips/contrib/groff/grog/
projects/mips/contrib/groff/grohtml/
projects/mips/contrib/groff/grolbp/
projects/mips/contrib/groff/grolj4/
projects/mips/contrib/groff/grops/
projects/mips/contrib/groff/grotty/
projects/mips/contrib/groff/hpftodit/
projects/mips/contrib/groff/include/
projects/mips/contrib/groff/indxbib/
projects/mips/contrib/groff/libbib/
projects/mips/contrib/groff/libdriver/
projects/mips/contrib/groff/libgroff/
projects/mips/contrib/groff/lkbib/
projects/mips/contrib/groff/lookbib/
projects/mips/contrib/groff/mm/
projects/mips/contrib/groff/nroff/
projects/mips/contrib/groff/pfbtops/
projects/mips/contrib/groff/pic/
projects/mips/contrib/groff/refer/
projects/mips/contrib/groff/soelim/
projects/mips/contrib/groff/src/xditview/
projects/mips/contrib/groff/tbl/
projects/mips/contrib/groff/tfmtodit/
projects/mips/contrib/groff/troff/
projects/mips/contrib/groff/xditview/
projects/mips/contrib/libpcap/doc/
projects/mips/contrib/libstdc++/config/abi/alpha-freebsd5/
projects/mips/contrib/libstdc++/config/abi/alpha-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/alphaev67-unknown-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/arm-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/hppa-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/i386-freebsd4/
projects/mips/contrib/libstdc++/config/abi/i386-freebsd5/
projects/mips/contrib/libstdc++/config/abi/i386-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/i486-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/i686-pc-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/ia64-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/ia64-unknown-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/m68k-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/mips-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/powerpc-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/s390-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/s390x-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/sparc-freebsd5/
projects/mips/contrib/libstdc++/config/abi/sparc-linux-gnu/
projects/mips/contrib/libstdc++/config/abi/x86_64-linux-gnu/
projects/mips/contrib/libstdc++/config/cpu/alpha/bits/
projects/mips/contrib/libstdc++/config/cpu/arm/bits/
projects/mips/contrib/libstdc++/config/cpu/cris/bits/
projects/mips/contrib/libstdc++/config/cpu/generic/bits/
projects/mips/contrib/libstdc++/config/cpu/i386/bits/
projects/mips/contrib/libstdc++/config/cpu/i486/bits/
projects/mips/contrib/libstdc++/config/cpu/ia64/bits/
projects/mips/contrib/libstdc++/config/cpu/m68k/bits/
projects/mips/contrib/libstdc++/config/cpu/mips/bits/
projects/mips/contrib/libstdc++/config/cpu/mmix/
projects/mips/contrib/libstdc++/config/cpu/powerpc/bits/
projects/mips/contrib/libstdc++/config/cpu/s390/
projects/mips/contrib/libstdc++/config/cpu/sparc/bits/
projects/mips/contrib/libstdc++/config/cpu/x86-64/
projects/mips/contrib/libstdc++/config/os/aix/bits/
projects/mips/contrib/libstdc++/config/os/bsd/freebsd/bits/
projects/mips/contrib/libstdc++/config/os/bsd/netbsd/bits/
projects/mips/contrib/libstdc++/config/os/djgpp/bits/
projects/mips/contrib/libstdc++/config/os/generic/bits/
projects/mips/contrib/libstdc++/config/os/gnu-linux/bits/
projects/mips/contrib/libstdc++/config/os/hpux/bits/
projects/mips/contrib/libstdc++/config/os/irix/irix5.2/bits/
projects/mips/contrib/libstdc++/config/os/irix/irix6.5/bits/
projects/mips/contrib/libstdc++/config/os/mingw32/bits/
projects/mips/contrib/libstdc++/config/os/newlib/bits/
projects/mips/contrib/libstdc++/config/os/osf/
projects/mips/contrib/libstdc++/config/os/qnx/qnx6.1/bits/
projects/mips/contrib/libstdc++/config/os/solaris/solaris2.5/bits/
projects/mips/contrib/libstdc++/config/os/solaris/solaris2.6/bits/
projects/mips/contrib/libstdc++/config/os/solaris/solaris2.7/bits/
projects/mips/contrib/libstdc++/include/c_shadow/
projects/mips/contrib/ncurses/tack/
projects/mips/contrib/ntp/html/hints/
projects/mips/contrib/ntp/scripts/support/
projects/mips/contrib/openpam/modules/pam_dummy/
projects/mips/crypto/openssl/os2/
projects/mips/gnu/usr.bin/perl/
projects/mips/gnu/usr.bin/pr/
projects/mips/gnu/usr.bin/texinfo/info-files/
projects/mips/lib/libftp/
projects/mips/libexec/bugfiler/
projects/mips/libexec/kpasswdd/
projects/mips/share/man/man4/man4.i386/ar.4
projects/mips/share/man/man4/man4.i386/ray.4
projects/mips/share/man/man4/man4.i386/sr.4
projects/mips/sys/cddl/dev/dtnfsclient/
projects/mips/sys/dev/ar/
projects/mips/sys/dev/ray/
projects/mips/sys/dev/sr/
projects/mips/sys/dev/usb/wlan/usb_wlan.h
projects/mips/sys/legacy/dev/usb/if_aue.c
projects/mips/sys/legacy/dev/usb/if_auereg.h
projects/mips/sys/legacy/dev/usb/if_axe.c
projects/mips/sys/legacy/dev/usb/if_axereg.h
projects/mips/sys/legacy/dev/usb/if_cdce.c
projects/mips/sys/legacy/dev/usb/if_cdcereg.h
projects/mips/sys/legacy/dev/usb/if_cue.c
projects/mips/sys/legacy/dev/usb/if_cuereg.h
projects/mips/sys/legacy/dev/usb/if_kue.c
projects/mips/sys/legacy/dev/usb/if_kuereg.h
projects/mips/sys/legacy/dev/usb/if_rue.c
projects/mips/sys/legacy/dev/usb/if_ruereg.h
projects/mips/sys/legacy/dev/usb/if_rum.c
projects/mips/sys/legacy/dev/usb/if_rumreg.h
projects/mips/sys/legacy/dev/usb/if_rumvar.h
projects/mips/sys/legacy/dev/usb/if_udav.c
projects/mips/sys/legacy/dev/usb/if_udavreg.h
projects/mips/sys/legacy/dev/usb/if_ural.c
projects/mips/sys/legacy/dev/usb/if_uralreg.h
projects/mips/sys/legacy/dev/usb/if_uralvar.h
projects/mips/sys/legacy/dev/usb/if_zyd.c
projects/mips/sys/legacy/dev/usb/if_zydfw.h
projects/mips/sys/legacy/dev/usb/if_zydreg.h
projects/mips/sys/legacy/dev/usb/kue_fw.h
projects/mips/sys/modules/ar/
projects/mips/sys/modules/ata/ata/
projects/mips/sys/modules/netgraph/sync_ar/
projects/mips/sys/modules/netgraph/sync_sr/
projects/mips/sys/modules/ray/
projects/mips/sys/modules/sr/
projects/mips/tools/tools/nanobsd/rescue/Files/conf/
projects/mips/tools/tools/nanobsd/rescue/Pkg/
projects/mips/usr.bin/compile_et/test/
projects/mips/usr.bin/diff/
projects/mips/usr.bin/file/config.h
projects/mips/usr.bin/grep/
projects/mips/usr.bin/timedef/
projects/mips/usr.sbin/bootpd/
projects/mips/usr.sbin/raycontrol/
projects/mips/usr.sbin/update/
projects/mips/usr.sbin/xntpd/
Modified:
projects/mips/ (props changed)
projects/mips/ObsoleteFiles.inc
projects/mips/UPDATING
projects/mips/bin/ls/ls.1
projects/mips/bin/rm/rm.c
projects/mips/bin/sh/parser.c
projects/mips/contrib/bind9/ (props changed)
projects/mips/contrib/cpio/ (props changed)
projects/mips/contrib/csup/ (props changed)
projects/mips/contrib/file/ (props changed)
projects/mips/contrib/file/ChangeLog
projects/mips/contrib/file/Magdir/animation
projects/mips/contrib/file/Magdir/audio
projects/mips/contrib/file/Magdir/cafebabe
projects/mips/contrib/file/Magdir/compress
projects/mips/contrib/file/Magdir/elf
projects/mips/contrib/file/Magdir/epoc
projects/mips/contrib/file/Magdir/filesystems
projects/mips/contrib/file/Magdir/graphviz
projects/mips/contrib/file/Magdir/images
projects/mips/contrib/file/Magdir/jpeg
projects/mips/contrib/file/Magdir/mach
projects/mips/contrib/file/Magdir/macintosh
projects/mips/contrib/file/Magdir/msdos
projects/mips/contrib/file/Magdir/perl
projects/mips/contrib/file/Magdir/printer
projects/mips/contrib/file/Magdir/timezone
projects/mips/contrib/file/Magdir/xwindows
projects/mips/contrib/file/Makefile.am
projects/mips/contrib/file/Makefile.in
projects/mips/contrib/file/README
projects/mips/contrib/file/TODO
projects/mips/contrib/file/apprentice.c
projects/mips/contrib/file/apptype.c
projects/mips/contrib/file/ascmagic.c
projects/mips/contrib/file/asprintf.c (contents, props changed)
projects/mips/contrib/file/compress.c
projects/mips/contrib/file/config.h.in
projects/mips/contrib/file/configure
projects/mips/contrib/file/configure.ac
projects/mips/contrib/file/elfclass.h (props changed)
projects/mips/contrib/file/file.c
projects/mips/contrib/file/file.h
projects/mips/contrib/file/file.man
projects/mips/contrib/file/file_opts.h
projects/mips/contrib/file/fsmagic.c
projects/mips/contrib/file/funcs.c
projects/mips/contrib/file/getopt_long.c (contents, props changed)
projects/mips/contrib/file/is_tar.c
projects/mips/contrib/file/libmagic.man
projects/mips/contrib/file/magic.c
projects/mips/contrib/file/magic.h
projects/mips/contrib/file/magic.man
projects/mips/contrib/file/mygetopt.h (props changed)
projects/mips/contrib/file/patchlevel.h
projects/mips/contrib/file/print.c
projects/mips/contrib/file/readelf.c
projects/mips/contrib/file/softmagic.c
projects/mips/contrib/file/tests/Makefile.am (props changed)
projects/mips/contrib/file/tests/Makefile.in (props changed)
projects/mips/contrib/file/tests/test.c (props changed)
projects/mips/contrib/file/vasprintf.c (contents, props changed)
projects/mips/contrib/gdb/ (props changed)
projects/mips/contrib/gdtoa/ (props changed)
projects/mips/contrib/ipfilter/ipsend/sbpf.c
projects/mips/contrib/libpcap/ (props changed)
projects/mips/contrib/ncurses/ (props changed)
projects/mips/contrib/netcat/ (props changed)
projects/mips/contrib/ntp/ (props changed)
projects/mips/contrib/ntp/ntpq/ntpq.c
projects/mips/contrib/openbsm/ (props changed)
projects/mips/contrib/openbsm/CREDITS
projects/mips/contrib/openbsm/INSTALL
projects/mips/contrib/openbsm/Makefile.in
projects/mips/contrib/openbsm/NEWS
projects/mips/contrib/openbsm/README
projects/mips/contrib/openbsm/TODO
projects/mips/contrib/openbsm/VERSION
projects/mips/contrib/openbsm/aclocal.m4
projects/mips/contrib/openbsm/bin/Makefile.in
projects/mips/contrib/openbsm/bin/audit/Makefile.in
projects/mips/contrib/openbsm/bin/audit/audit.c
projects/mips/contrib/openbsm/bin/auditd/Makefile.in
projects/mips/contrib/openbsm/bin/auditd/auditd.c
projects/mips/contrib/openbsm/bin/auditd/auditd_darwin.c
projects/mips/contrib/openbsm/bin/auditd/auditd_fbsd.c
projects/mips/contrib/openbsm/bin/auditfilterd/Makefile.in
projects/mips/contrib/openbsm/bin/auditfilterd/auditfilterd.8
projects/mips/contrib/openbsm/bin/auditreduce/Makefile.in
projects/mips/contrib/openbsm/bin/praudit/Makefile.in
projects/mips/contrib/openbsm/bsm/Makefile.in
projects/mips/contrib/openbsm/bsm/audit_uevents.h
projects/mips/contrib/openbsm/bsm/libbsm.h
projects/mips/contrib/openbsm/config/config.h.in
projects/mips/contrib/openbsm/config/ltmain.sh
projects/mips/contrib/openbsm/configure
projects/mips/contrib/openbsm/configure.ac
projects/mips/contrib/openbsm/etc/audit_class
projects/mips/contrib/openbsm/etc/audit_control
projects/mips/contrib/openbsm/etc/audit_event
projects/mips/contrib/openbsm/libauditd/Makefile.in
projects/mips/contrib/openbsm/libauditd/auditd_lib.c
projects/mips/contrib/openbsm/libbsm/Makefile.am
projects/mips/contrib/openbsm/libbsm/Makefile.in
projects/mips/contrib/openbsm/libbsm/au_control.3
projects/mips/contrib/openbsm/libbsm/audit_submit.3
projects/mips/contrib/openbsm/libbsm/bsm_audit.c
projects/mips/contrib/openbsm/libbsm/bsm_control.c
projects/mips/contrib/openbsm/libbsm/bsm_domain.c
projects/mips/contrib/openbsm/libbsm/bsm_io.c
projects/mips/contrib/openbsm/libbsm/bsm_notify.c
projects/mips/contrib/openbsm/libbsm/bsm_token.c
projects/mips/contrib/openbsm/libbsm/bsm_wrappers.c
projects/mips/contrib/openbsm/libbsm/libbsm.3
projects/mips/contrib/openbsm/man/Makefile.in
projects/mips/contrib/openbsm/man/auditon.2
projects/mips/contrib/openbsm/modules/Makefile.in
projects/mips/contrib/openbsm/modules/auditfilter_noop/Makefile.in
projects/mips/contrib/openbsm/sys/Makefile.in
projects/mips/contrib/openbsm/sys/bsm/Makefile.am
projects/mips/contrib/openbsm/sys/bsm/Makefile.in
projects/mips/contrib/openbsm/sys/bsm/audit.h
projects/mips/contrib/openbsm/sys/bsm/audit_domain.h
projects/mips/contrib/openbsm/sys/bsm/audit_kevents.h
projects/mips/contrib/openbsm/sys/bsm/audit_record.h
projects/mips/contrib/openbsm/test/Makefile.in
projects/mips/contrib/openbsm/test/bsm/Makefile.in
projects/mips/contrib/openbsm/tools/Makefile.in
projects/mips/contrib/openpam/ (props changed)
projects/mips/contrib/pf/ (props changed)
projects/mips/contrib/sendmail/ (props changed)
projects/mips/contrib/tcpdump/ (props changed)
projects/mips/contrib/top/ (props changed)
projects/mips/contrib/top/install-sh (props changed)
projects/mips/crypto/openssh/ (props changed)
projects/mips/crypto/openssl/ (props changed)
projects/mips/crypto/openssl/crypto/asn1/asn1.h
projects/mips/crypto/openssl/crypto/asn1/asn1_err.c
projects/mips/crypto/openssl/crypto/asn1/tasn_dec.c
projects/mips/etc/rc.d/jail
projects/mips/include/signal.h
projects/mips/lib/libarchive/Makefile
projects/mips/lib/libarchive/archive.h
projects/mips/lib/libarchive/archive_entry.c
projects/mips/lib/libarchive/archive_platform.h
projects/mips/lib/libarchive/archive_read.3
projects/mips/lib/libarchive/archive_read.c
projects/mips/lib/libarchive/archive_read_disk_entry_from_file.c
projects/mips/lib/libarchive/archive_read_disk_set_standard_lookup.c
projects/mips/lib/libarchive/archive_read_open_fd.c
projects/mips/lib/libarchive/archive_read_open_file.c
projects/mips/lib/libarchive/archive_read_open_filename.c
projects/mips/lib/libarchive/archive_read_private.h
projects/mips/lib/libarchive/archive_read_support_compression_all.c
projects/mips/lib/libarchive/archive_read_support_compression_bzip2.c
projects/mips/lib/libarchive/archive_read_support_compression_compress.c
projects/mips/lib/libarchive/archive_read_support_compression_gzip.c
projects/mips/lib/libarchive/archive_read_support_format_cpio.c
projects/mips/lib/libarchive/archive_read_support_format_empty.c
projects/mips/lib/libarchive/archive_read_support_format_iso9660.c
projects/mips/lib/libarchive/archive_read_support_format_mtree.c
projects/mips/lib/libarchive/archive_read_support_format_tar.c
projects/mips/lib/libarchive/archive_write.3
projects/mips/lib/libarchive/archive_write.c
projects/mips/lib/libarchive/archive_write_disk.c
projects/mips/lib/libarchive/archive_write_disk_set_standard_lookup.c
projects/mips/lib/libarchive/archive_write_open_filename.c
projects/mips/lib/libarchive/archive_write_set_compression_bzip2.c
projects/mips/lib/libarchive/archive_write_set_compression_gzip.c
projects/mips/lib/libarchive/archive_write_set_format_cpio.c
projects/mips/lib/libarchive/archive_write_set_format_mtree.c
projects/mips/lib/libarchive/archive_write_set_format_pax.c
projects/mips/lib/libarchive/archive_write_set_format_ustar.c
projects/mips/lib/libarchive/config_freebsd.h
projects/mips/lib/libarchive/libarchive-formats.5
projects/mips/lib/libarchive/tar.5
projects/mips/lib/libarchive/test/Makefile
projects/mips/lib/libarchive/test/main.c
projects/mips/lib/libarchive/test/read_open_memory.c
projects/mips/lib/libarchive/test/test.h
projects/mips/lib/libarchive/test/test_acl_pax.c
projects/mips/lib/libarchive/test/test_compat_bzip2.c
projects/mips/lib/libarchive/test/test_compat_gzip.c
projects/mips/lib/libarchive/test/test_entry.c
projects/mips/lib/libarchive/test/test_entry_strmode.c
projects/mips/lib/libarchive/test/test_extattr_freebsd.c
projects/mips/lib/libarchive/test/test_fuzz.c
projects/mips/lib/libarchive/test/test_pax_filename_encoding.c
projects/mips/lib/libarchive/test/test_pax_filename_encoding.tar.uu
projects/mips/lib/libarchive/test/test_read_compress_program.c
projects/mips/lib/libarchive/test/test_read_disk.c
projects/mips/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
projects/mips/lib/libarchive/test/test_read_format_cpio_bin_gz.c
projects/mips/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
projects/mips/lib/libarchive/test/test_read_format_gtar_gz.c
projects/mips/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu
projects/mips/lib/libarchive/test/test_read_format_iso_gz.c
projects/mips/lib/libarchive/test/test_read_format_isojoliet_bz2.c
projects/mips/lib/libarchive/test/test_read_format_isorr_bz2.c
projects/mips/lib/libarchive/test/test_read_format_isorr_bz2.iso.bz2.uu
projects/mips/lib/libarchive/test/test_read_format_mtree.c
projects/mips/lib/libarchive/test/test_read_format_pax_bz2.c
projects/mips/lib/libarchive/test/test_read_format_tbz.c
projects/mips/lib/libarchive/test/test_read_format_tgz.c
projects/mips/lib/libarchive/test/test_write_compress_program.c
projects/mips/lib/libarchive/test/test_write_disk_failures.c
projects/mips/lib/libarchive/test/test_write_disk_sparse.c
projects/mips/lib/libbluetooth/Makefile
projects/mips/lib/libbluetooth/bluetooth.3
projects/mips/lib/libbluetooth/bluetooth.h
projects/mips/lib/libbluetooth/hci.c
projects/mips/lib/libbsm/Makefile
projects/mips/lib/libc/ (props changed)
projects/mips/lib/libc/gen/Symbol.map
projects/mips/lib/libc/net/sourcefilter.c
projects/mips/lib/libc/posix1e/acl_set_qualifier.3
projects/mips/lib/libc/stdio/asprintf.c (props changed)
projects/mips/lib/libc/stdlib/ptsname.3
projects/mips/lib/libc/stdtime/ (props changed)
projects/mips/lib/libc/string/ffsll.c (props changed)
projects/mips/lib/libc/string/flsll.c (props changed)
projects/mips/lib/libc/string/memchr.3
projects/mips/lib/libc/string/strmode.3
projects/mips/lib/libc/string/strmode.c
projects/mips/lib/libc/string/wcpcpy.c (props changed)
projects/mips/lib/libc/sys/Makefile.inc
projects/mips/lib/libc/sys/Symbol.map
projects/mips/lib/libc/sys/jail.2
projects/mips/lib/libc/sys/sctp_generic_recvmsg.2
projects/mips/lib/libc/sys/sctp_generic_sendmsg.2
projects/mips/lib/libc/sys/sctp_peeloff.2
projects/mips/lib/libc/sys/setfib.2
projects/mips/lib/libmagic/Makefile
projects/mips/lib/libmagic/config.h
projects/mips/lib/libthr/thread/thr_rtld.c
projects/mips/lib/libusb/ (props changed)
projects/mips/lib/libusb/usb.h (props changed)
projects/mips/lib/libutil/ (props changed)
projects/mips/libexec/rtld-elf/amd64/rtld_machdep.h
projects/mips/libexec/rtld-elf/arm/rtld_machdep.h
projects/mips/libexec/rtld-elf/i386/rtld_machdep.h
projects/mips/libexec/rtld-elf/ia64/rtld_machdep.h
projects/mips/libexec/rtld-elf/mips/rtld_machdep.h
projects/mips/libexec/rtld-elf/powerpc/rtld_machdep.h
projects/mips/libexec/rtld-elf/rtld_lock.c
projects/mips/libexec/rtld-elf/sparc64/rtld_machdep.h
projects/mips/release/doc/en_US.ISO8859-1/hardware/article.sgml
projects/mips/release/doc/share/misc/dev.archlist.txt
projects/mips/release/picobsd/tinyware/ns/ns.c
projects/mips/rescue/rescue/Makefile
projects/mips/sbin/ (props changed)
projects/mips/sbin/geom/class/journal/gjournal.8
projects/mips/sbin/ifconfig/af_inet.c
projects/mips/sbin/ifconfig/ifconfig.c
projects/mips/sbin/ifconfig/iflagg.c
projects/mips/sbin/ipfw/ (props changed)
projects/mips/sbin/newfs/newfs.8
projects/mips/sbin/pflogd/Makefile
projects/mips/sbin/route/keywords
projects/mips/sbin/route/route.c
projects/mips/sbin/savecore/savecore.8
projects/mips/sbin/tunefs/tunefs.8
projects/mips/share/man/man4/cpuctl.4
projects/mips/share/man/man4/ed.4
projects/mips/share/man/man4/geom_fox.4
projects/mips/share/man/man4/isp.4
projects/mips/share/man/man4/man4.i386/Makefile
projects/mips/share/man/man4/man4.i386/glxsb.4
projects/mips/share/man/man4/man4.powerpc/Makefile
projects/mips/share/man/man4/man4.powerpc/bm.4
projects/mips/share/man/man4/mpt.4
projects/mips/share/man/man4/ng_hole.4
projects/mips/share/man/man4/pts.4
projects/mips/share/man/man4/route.4
projects/mips/share/man/man4/u3g.4
projects/mips/share/man/man4/vlan.4
projects/mips/share/man/man5/rc.conf.5
projects/mips/share/man/man9/altq.9
projects/mips/share/misc/bsd-family-tree
projects/mips/share/misc/committers-src.dot
projects/mips/share/zoneinfo/ (props changed)
projects/mips/share/zoneinfo/africa
projects/mips/share/zoneinfo/asia
projects/mips/sys/ (props changed)
projects/mips/sys/amd64/amd64/busdma_machdep.c
projects/mips/sys/amd64/amd64/identcpu.c
projects/mips/sys/amd64/amd64/local_apic.c
projects/mips/sys/amd64/amd64/mp_machdep.c
projects/mips/sys/amd64/conf/DEFAULTS
projects/mips/sys/amd64/conf/GENERIC
projects/mips/sys/amd64/conf/XENHVM
projects/mips/sys/amd64/include/apicvar.h
projects/mips/sys/amd64/include/clock.h
projects/mips/sys/amd64/include/metadata.h
projects/mips/sys/amd64/include/param.h
projects/mips/sys/amd64/include/pc/bios.h
projects/mips/sys/amd64/include/pcpu.h
projects/mips/sys/amd64/include/smp.h
projects/mips/sys/amd64/include/specialreg.h
projects/mips/sys/amd64/include/xen/ (props changed)
projects/mips/sys/amd64/isa/clock.c
projects/mips/sys/amd64/linux32/linux32_sysvec.c
projects/mips/sys/arm/arm/busdma_machdep.c
projects/mips/sys/arm/arm/cpufunc.c
projects/mips/sys/arm/arm/cpufunc_asm_armv5_ec.S
projects/mips/sys/arm/arm/cpufunc_asm_sheeva.S
projects/mips/sys/arm/at91/at91.c
projects/mips/sys/arm/at91/at91_machdep.c
projects/mips/sys/arm/at91/at91rm92reg.h
projects/mips/sys/arm/at91/files.at91
projects/mips/sys/arm/conf/AVILA.hints
projects/mips/sys/arm/conf/BWCT
projects/mips/sys/arm/conf/BWCT.hints
projects/mips/sys/arm/conf/CAMBRIA.hints
projects/mips/sys/arm/conf/NSLU.hints
projects/mips/sys/arm/include/param.h
projects/mips/sys/arm/mv/common.c
projects/mips/sys/arm/mv/gpio.c
projects/mips/sys/arm/mv/ic.c
projects/mips/sys/arm/mv/mv_pci.c
projects/mips/sys/arm/mv/mvreg.h
projects/mips/sys/boot/i386/libi386/biosdisk.c
projects/mips/sys/boot/i386/libi386/biossmap.c
projects/mips/sys/boot/sparc64/loader/main.c
projects/mips/sys/boot/uboot/lib/devicename.c
projects/mips/sys/boot/uboot/lib/disk.c
projects/mips/sys/boot/uboot/lib/libuboot.h
projects/mips/sys/bsm/audit.h
projects/mips/sys/bsm/audit_domain.h
projects/mips/sys/bsm/audit_kevents.h
projects/mips/sys/bsm/audit_record.h
projects/mips/sys/cam/scsi/scsi_sa.c
projects/mips/sys/cam/scsi/scsi_ses.c
projects/mips/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c
projects/mips/sys/compat/freebsd32/freebsd32_misc.c
projects/mips/sys/compat/freebsd32/freebsd32_proto.h
projects/mips/sys/compat/freebsd32/freebsd32_syscall.h
projects/mips/sys/compat/freebsd32/freebsd32_syscalls.c
projects/mips/sys/compat/freebsd32/freebsd32_sysent.c
projects/mips/sys/compat/freebsd32/syscalls.master
projects/mips/sys/compat/linux/linux_emul.c
projects/mips/sys/compat/linux/linux_emul.h
projects/mips/sys/compat/linux/linux_futex.c
projects/mips/sys/compat/linux/linux_futex.h
projects/mips/sys/compat/linux/linux_mib.c
projects/mips/sys/compat/linux/linux_socket.c
projects/mips/sys/conf/NOTES
projects/mips/sys/conf/files
projects/mips/sys/conf/files.powerpc
projects/mips/sys/conf/kern.post.mk
projects/mips/sys/conf/options
projects/mips/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
projects/mips/sys/contrib/pf/ (props changed)
projects/mips/sys/contrib/pf/net/if_pflog.c
projects/mips/sys/contrib/pf/net/if_pfsync.c
projects/mips/sys/contrib/pf/net/pf.c
projects/mips/sys/dev/acpica/acpi.c
projects/mips/sys/dev/acpica/acpi_cpu.c
projects/mips/sys/dev/agp/agp.c
projects/mips/sys/dev/ata/ata-all.h
projects/mips/sys/dev/ata/ata-disk.c
projects/mips/sys/dev/ata/ata-pci.c
projects/mips/sys/dev/ata/ata-pci.h
projects/mips/sys/dev/ata/ata-queue.c
projects/mips/sys/dev/ata/ata-sata.c
projects/mips/sys/dev/ata/ata-usb.c (props changed)
projects/mips/sys/dev/ata/atapi-tape.c
projects/mips/sys/dev/ata/chipsets/ata-ahci.c
projects/mips/sys/dev/ata/chipsets/ata-ati.c
projects/mips/sys/dev/ath/ath_hal/ah.c
projects/mips/sys/dev/ath/ath_hal/ar5210/ar5210_phy.c
projects/mips/sys/dev/ath/ath_hal/ar5211/ar5211_phy.c
projects/mips/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c
projects/mips/sys/dev/ath/ath_rate/sample/sample.c
projects/mips/sys/dev/ath/if_ath.c
projects/mips/sys/dev/atkbdc/atkbd.c
projects/mips/sys/dev/cxgb/ (props changed)
projects/mips/sys/dev/cxgb/cxgb_multiq.c
projects/mips/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
projects/mips/sys/dev/drm/drm_drv.c
projects/mips/sys/dev/e1000/if_em.c
projects/mips/sys/dev/e1000/if_em.h
projects/mips/sys/dev/e1000/if_igb.c
projects/mips/sys/dev/ed/if_ed.c
projects/mips/sys/dev/ed/if_ed_cbus.c
projects/mips/sys/dev/ed/if_ed_isa.c
projects/mips/sys/dev/ed/if_ed_pccard.c
projects/mips/sys/dev/ed/if_ed_pci.c
projects/mips/sys/dev/ed/if_edvar.h
projects/mips/sys/dev/fb/creator.c
projects/mips/sys/dev/fb/machfb.c
projects/mips/sys/dev/fxp/if_fxp.c
projects/mips/sys/dev/if_ndis/if_ndis.c
projects/mips/sys/dev/if_ndis/if_ndisvar.h
projects/mips/sys/dev/iicbus/ds133x.c
projects/mips/sys/dev/iicbus/ds1672.c
projects/mips/sys/dev/iicbus/if_ic.c
projects/mips/sys/dev/ipw/if_ipw.c
projects/mips/sys/dev/ipw/if_ipwvar.h
projects/mips/sys/dev/iwi/if_iwi.c
projects/mips/sys/dev/iwi/if_iwivar.h
projects/mips/sys/dev/iwn/if_iwn.c
projects/mips/sys/dev/iwn/if_iwnvar.h
projects/mips/sys/dev/joy/joy.c
projects/mips/sys/dev/lmc/if_lmc.c
projects/mips/sys/dev/lmc/if_lmc.h
projects/mips/sys/dev/mge/if_mge.c
projects/mips/sys/dev/mlx/mlx.c
projects/mips/sys/dev/mly/mly.c
projects/mips/sys/dev/mse/mse.c
projects/mips/sys/dev/mxge/if_mxge.c
projects/mips/sys/dev/mxge/if_mxge_var.h
projects/mips/sys/dev/nve/if_nve.c
projects/mips/sys/dev/pccard/pccarddevs
projects/mips/sys/dev/pci/pci.c
projects/mips/sys/dev/pci/pcireg.h
projects/mips/sys/dev/powermac_nvram/powermac_nvram.c
projects/mips/sys/dev/ppbus/if_plip.c
projects/mips/sys/dev/re/if_re.c
projects/mips/sys/dev/rp/rp.c
projects/mips/sys/dev/rp/rp_pci.c
projects/mips/sys/dev/rp/rpreg.h
projects/mips/sys/dev/sk/if_sk.c
projects/mips/sys/dev/sound/pci/envy24.c
projects/mips/sys/dev/sound/pci/envy24ht.c
projects/mips/sys/dev/sound/usb/uaudio.c (props changed)
projects/mips/sys/dev/sound/usb/uaudio.h (props changed)
projects/mips/sys/dev/sound/usb/uaudio_pcm.c (props changed)
projects/mips/sys/dev/sound/usb/uaudioreg.h (props changed)
projects/mips/sys/dev/tdfx/tdfx_pci.c
projects/mips/sys/dev/twa/tw_osl_freebsd.c
projects/mips/sys/dev/twe/twe_freebsd.c
projects/mips/sys/dev/usb/README.TXT (props changed)
projects/mips/sys/dev/usb/bluetooth/TODO.TXT (props changed)
projects/mips/sys/dev/usb/bluetooth/ng_ubt.c (props changed)
projects/mips/sys/dev/usb/bluetooth/ng_ubt_var.h (props changed)
projects/mips/sys/dev/usb/bluetooth/ubtbcmfw.c (props changed)
projects/mips/sys/dev/usb/controller/at91dci.c (contents, props changed)
projects/mips/sys/dev/usb/controller/at91dci.h (contents, props changed)
projects/mips/sys/dev/usb/controller/at91dci_atmelarm.c (props changed)
projects/mips/sys/dev/usb/controller/atmegadci.c
projects/mips/sys/dev/usb/controller/atmegadci.h
projects/mips/sys/dev/usb/controller/ehci.c (contents, props changed)
projects/mips/sys/dev/usb/controller/ehci.h (contents, props changed)
projects/mips/sys/dev/usb/controller/ehci_pci.c (props changed)
projects/mips/sys/dev/usb/controller/musb_otg.c (contents, props changed)
projects/mips/sys/dev/usb/controller/musb_otg.h (props changed)
projects/mips/sys/dev/usb/controller/musb_otg_atmelarm.c (props changed)
projects/mips/sys/dev/usb/controller/ohci.c (contents, props changed)
projects/mips/sys/dev/usb/controller/ohci.h (contents, props changed)
projects/mips/sys/dev/usb/controller/ohci_atmelarm.c (props changed)
projects/mips/sys/dev/usb/controller/ohci_pci.c (props changed)
projects/mips/sys/dev/usb/controller/uhci.c (contents, props changed)
projects/mips/sys/dev/usb/controller/uhci.h (contents, props changed)
projects/mips/sys/dev/usb/controller/uhci_pci.c (props changed)
projects/mips/sys/dev/usb/controller/usb_controller.c (contents, props changed)
projects/mips/sys/dev/usb/controller/uss820dci.c (contents, props changed)
projects/mips/sys/dev/usb/controller/uss820dci.h (contents, props changed)
projects/mips/sys/dev/usb/controller/uss820dci_atmelarm.c (props changed)
projects/mips/sys/dev/usb/input/uhid.c (props changed)
projects/mips/sys/dev/usb/input/ukbd.c (props changed)
projects/mips/sys/dev/usb/input/ums.c (props changed)
projects/mips/sys/dev/usb/input/usb_rdesc.h (props changed)
projects/mips/sys/dev/usb/misc/udbp.c (props changed)
projects/mips/sys/dev/usb/misc/udbp.h (props changed)
projects/mips/sys/dev/usb/misc/ufm.c (props changed)
projects/mips/sys/dev/usb/net/if_aue.c (contents, props changed)
projects/mips/sys/dev/usb/net/if_auereg.h (props changed)
projects/mips/sys/dev/usb/net/if_axe.c (contents, props changed)
projects/mips/sys/dev/usb/net/if_axereg.h (props changed)
projects/mips/sys/dev/usb/net/if_cdce.c (contents, props changed)
projects/mips/sys/dev/usb/net/if_cdcereg.h (props changed)
projects/mips/sys/dev/usb/net/if_cue.c (contents, props changed)
projects/mips/sys/dev/usb/net/if_cuereg.h (props changed)
projects/mips/sys/dev/usb/net/if_kue.c (contents, props changed)
projects/mips/sys/dev/usb/net/if_kuefw.h (props changed)
projects/mips/sys/dev/usb/net/if_kuereg.h (props changed)
projects/mips/sys/dev/usb/net/if_rue.c (contents, props changed)
projects/mips/sys/dev/usb/net/if_ruereg.h (props changed)
projects/mips/sys/dev/usb/net/if_udav.c (contents, props changed)
projects/mips/sys/dev/usb/net/if_udavreg.h (props changed)
projects/mips/sys/dev/usb/net/usb_ethernet.c (contents, props changed)
projects/mips/sys/dev/usb/net/usb_ethernet.h (contents, props changed)
projects/mips/sys/dev/usb/quirk/usb_quirk.c (props changed)
projects/mips/sys/dev/usb/quirk/usb_quirk.h (props changed)
projects/mips/sys/dev/usb/serial/u3g.c (props changed)
projects/mips/sys/dev/usb/serial/uark.c (props changed)
projects/mips/sys/dev/usb/serial/ubsa.c (props changed)
projects/mips/sys/dev/usb/serial/ubser.c (props changed)
projects/mips/sys/dev/usb/serial/uchcom.c (props changed)
projects/mips/sys/dev/usb/serial/ucycom.c (props changed)
projects/mips/sys/dev/usb/serial/ufoma.c (props changed)
projects/mips/sys/dev/usb/serial/uftdi.c (contents, props changed)
projects/mips/sys/dev/usb/serial/uftdi_reg.h (props changed)
projects/mips/sys/dev/usb/serial/ugensa.c (props changed)
projects/mips/sys/dev/usb/serial/uipaq.c (props changed)
projects/mips/sys/dev/usb/serial/ulpt.c (props changed)
projects/mips/sys/dev/usb/serial/umct.c (props changed)
projects/mips/sys/dev/usb/serial/umodem.c (props changed)
projects/mips/sys/dev/usb/serial/umoscom.c (props changed)
projects/mips/sys/dev/usb/serial/uplcom.c (props changed)
projects/mips/sys/dev/usb/serial/usb_serial.c (props changed)
projects/mips/sys/dev/usb/serial/usb_serial.h (props changed)
projects/mips/sys/dev/usb/serial/uvisor.c (props changed)
projects/mips/sys/dev/usb/serial/uvscom.c (props changed)
projects/mips/sys/dev/usb/storage/rio500_usb.h (props changed)
projects/mips/sys/dev/usb/storage/umass.c (props changed)
projects/mips/sys/dev/usb/storage/urio.c (props changed)
projects/mips/sys/dev/usb/storage/ustorage_fs.c (contents, props changed)
projects/mips/sys/dev/usb/template/usb_template.c (contents, props changed)
projects/mips/sys/dev/usb/template/usb_template.h (props changed)
projects/mips/sys/dev/usb/template/usb_template_cdce.c (props changed)
projects/mips/sys/dev/usb/template/usb_template_msc.c (props changed)
projects/mips/sys/dev/usb/template/usb_template_mtp.c (props changed)
projects/mips/sys/dev/usb/ufm_ioctl.h (props changed)
projects/mips/sys/dev/usb/usb.h (props changed)
projects/mips/sys/dev/usb/usb_bus.h (contents, props changed)
projects/mips/sys/dev/usb/usb_busdma.c (props changed)
projects/mips/sys/dev/usb/usb_busdma.h (props changed)
projects/mips/sys/dev/usb/usb_cdc.h (props changed)
projects/mips/sys/dev/usb/usb_compat_linux.c (contents, props changed)
projects/mips/sys/dev/usb/usb_compat_linux.h (props changed)
projects/mips/sys/dev/usb/usb_controller.h (contents, props changed)
projects/mips/sys/dev/usb/usb_core.c (props changed)
projects/mips/sys/dev/usb/usb_core.h (contents, props changed)
projects/mips/sys/dev/usb/usb_debug.c (props changed)
projects/mips/sys/dev/usb/usb_debug.h (props changed)
projects/mips/sys/dev/usb/usb_defs.h (props changed)
projects/mips/sys/dev/usb/usb_dev.c (props changed)
projects/mips/sys/dev/usb/usb_dev.h (props changed)
projects/mips/sys/dev/usb/usb_device.c (contents, props changed)
projects/mips/sys/dev/usb/usb_device.h (contents, props changed)
projects/mips/sys/dev/usb/usb_dynamic.c (contents, props changed)
projects/mips/sys/dev/usb/usb_dynamic.h (contents, props changed)
projects/mips/sys/dev/usb/usb_endian.h (props changed)
projects/mips/sys/dev/usb/usb_error.c (props changed)
projects/mips/sys/dev/usb/usb_error.h (props changed)
projects/mips/sys/dev/usb/usb_generic.c (contents, props changed)
projects/mips/sys/dev/usb/usb_generic.h (props changed)
projects/mips/sys/dev/usb/usb_handle_request.c (contents, props changed)
projects/mips/sys/dev/usb/usb_handle_request.h (props changed)
projects/mips/sys/dev/usb/usb_hid.c (props changed)
projects/mips/sys/dev/usb/usb_hid.h (props changed)
projects/mips/sys/dev/usb/usb_hub.c (contents, props changed)
projects/mips/sys/dev/usb/usb_hub.h (props changed)
projects/mips/sys/dev/usb/usb_if.m (props changed)
projects/mips/sys/dev/usb/usb_ioctl.h (props changed)
projects/mips/sys/dev/usb/usb_lookup.c (props changed)
projects/mips/sys/dev/usb/usb_lookup.h (props changed)
projects/mips/sys/dev/usb/usb_mbuf.c (props changed)
projects/mips/sys/dev/usb/usb_mbuf.h (props changed)
projects/mips/sys/dev/usb/usb_mfunc.h (props changed)
projects/mips/sys/dev/usb/usb_msctest.c (props changed)
projects/mips/sys/dev/usb/usb_msctest.h (props changed)
projects/mips/sys/dev/usb/usb_parse.c (props changed)
projects/mips/sys/dev/usb/usb_parse.h (props changed)
projects/mips/sys/dev/usb/usb_pci.h (props changed)
projects/mips/sys/dev/usb/usb_process.c (props changed)
projects/mips/sys/dev/usb/usb_process.h (props changed)
projects/mips/sys/dev/usb/usb_request.c (contents, props changed)
projects/mips/sys/dev/usb/usb_request.h (contents, props changed)
projects/mips/sys/dev/usb/usb_revision.h (contents, props changed)
projects/mips/sys/dev/usb/usb_transfer.c (contents, props changed)
projects/mips/sys/dev/usb/usb_transfer.h (props changed)
projects/mips/sys/dev/usb/usb_util.c (props changed)
projects/mips/sys/dev/usb/usb_util.h (props changed)
projects/mips/sys/dev/usb/usbdevs (contents, props changed)
projects/mips/sys/dev/usb/usbhid.h (props changed)
projects/mips/sys/dev/usb/wlan/if_rum.c (contents, props changed)
projects/mips/sys/dev/usb/wlan/if_rumfw.h (props changed)
projects/mips/sys/dev/usb/wlan/if_rumreg.h (props changed)
projects/mips/sys/dev/usb/wlan/if_rumvar.h (contents, props changed)
projects/mips/sys/dev/usb/wlan/if_uath.c
projects/mips/sys/dev/usb/wlan/if_uathvar.h
projects/mips/sys/dev/usb/wlan/if_ural.c (contents, props changed)
projects/mips/sys/dev/usb/wlan/if_uralreg.h (props changed)
projects/mips/sys/dev/usb/wlan/if_uralvar.h (contents, props changed)
projects/mips/sys/dev/usb/wlan/if_zyd.c (contents, props changed)
projects/mips/sys/dev/usb/wlan/if_zydfw.h (props changed)
projects/mips/sys/dev/usb/wlan/if_zydreg.h (contents, props changed)
projects/mips/sys/dev/wi/if_wi.c
projects/mips/sys/dev/wi/if_wivar.h
projects/mips/sys/dev/wpi/if_wpi.c
projects/mips/sys/dev/wpi/if_wpivar.h
projects/mips/sys/dev/xen/netfront/ (props changed)
projects/mips/sys/dev/xen/xenpci/ (props changed)
projects/mips/sys/dev/xl/if_xl.c
projects/mips/sys/geom/part/g_part.c
projects/mips/sys/geom/part/g_part_ebr.c
projects/mips/sys/geom/part/g_part_if.m
projects/mips/sys/geom/vinum/geom_vinum.c
projects/mips/sys/geom/vinum/geom_vinum.h
projects/mips/sys/geom/vinum/geom_vinum_events.c
projects/mips/sys/geom/vinum/geom_vinum_plex.c
projects/mips/sys/geom/vinum/geom_vinum_raid5.c
projects/mips/sys/geom/vinum/geom_vinum_rename.c
projects/mips/sys/geom/vinum/geom_vinum_rm.c
projects/mips/sys/geom/vinum/geom_vinum_subr.c
projects/mips/sys/geom/vinum/geom_vinum_var.h
projects/mips/sys/i386/bios/apm.c
projects/mips/sys/i386/conf/DEFAULTS
projects/mips/sys/i386/conf/GENERIC
projects/mips/sys/i386/i386/busdma_machdep.c
projects/mips/sys/i386/i386/identcpu.c
projects/mips/sys/i386/i386/local_apic.c
projects/mips/sys/i386/i386/mp_machdep.c
projects/mips/sys/i386/include/apicvar.h
projects/mips/sys/i386/include/clock.h
projects/mips/sys/i386/include/metadata.h
projects/mips/sys/i386/include/param.h
projects/mips/sys/i386/include/pc/bios.h
projects/mips/sys/i386/include/smp.h
projects/mips/sys/i386/include/specialreg.h
projects/mips/sys/i386/isa/clock.c
projects/mips/sys/i386/linux/linux_sysvec.c
projects/mips/sys/i386/xen/clock.c
projects/mips/sys/i386/xen/mp_machdep.c
projects/mips/sys/ia64/ia64/busdma_machdep.c
projects/mips/sys/ia64/include/param.h
projects/mips/sys/ia64/isa/isa.c
projects/mips/sys/isa/atrtc.c
projects/mips/sys/isa/rtc.h
projects/mips/sys/kern/init_main.c
projects/mips/sys/kern/init_sysent.c
projects/mips/sys/kern/kern_conf.c
projects/mips/sys/kern/kern_cpuset.c
projects/mips/sys/kern/kern_descrip.c
projects/mips/sys/kern/kern_exit.c
projects/mips/sys/kern/kern_fork.c
projects/mips/sys/kern/kern_jail.c
projects/mips/sys/kern/kern_linker.c
projects/mips/sys/kern/kern_malloc.c
projects/mips/sys/kern/kern_mib.c
projects/mips/sys/kern/kern_osd.c
projects/mips/sys/kern/kern_rmlock.c
projects/mips/sys/kern/kern_sysctl.c
projects/mips/sys/kern/kern_umtx.c
projects/mips/sys/kern/kern_uuid.c
projects/mips/sys/kern/kern_vimage.c
projects/mips/sys/kern/sched_ule.c
projects/mips/sys/kern/subr_pcpu.c
projects/mips/sys/kern/subr_smp.c
projects/mips/sys/kern/subr_witness.c
projects/mips/sys/kern/sys_socket.c
projects/mips/sys/kern/syscalls.c
projects/mips/sys/kern/syscalls.master
projects/mips/sys/kern/systrace_args.c
projects/mips/sys/kern/tty.c
projects/mips/sys/kern/tty_pts.c
projects/mips/sys/kern/uipc_sockbuf.c
projects/mips/sys/kern/uipc_socket.c
projects/mips/sys/kern/uipc_syscalls.c
projects/mips/sys/kern/uipc_usrreq.c
projects/mips/sys/kern/vfs_acl.c
projects/mips/sys/kern/vfs_bio.c
projects/mips/sys/kern/vfs_cache.c
projects/mips/sys/kern/vfs_vnops.c
projects/mips/sys/legacy/dev/ata/ata-usb.c (props changed)
projects/mips/sys/legacy/dev/sound/usb/uaudio.c (props changed)
projects/mips/sys/legacy/dev/sound/usb/uaudio.h (props changed)
projects/mips/sys/legacy/dev/sound/usb/uaudio_pcm.c (props changed)
projects/mips/sys/legacy/dev/sound/usb/uaudioreg.h (props changed)
projects/mips/sys/legacy/dev/usb/ (props changed)
projects/mips/sys/legacy/dev/usb/ehci_ixp4xx.c (props changed)
projects/mips/sys/mips/include/param.h
projects/mips/sys/mips/include/pmap.h
projects/mips/sys/mips/mips/pmap.c
projects/mips/sys/modules/Makefile
projects/mips/sys/modules/dtrace/dtnfsclient/ (props changed)
projects/mips/sys/modules/ip6_mroute_mod/ (props changed)
projects/mips/sys/modules/ipmi/ipmi_linux/ (props changed)
projects/mips/sys/net/bpf.c
projects/mips/sys/net/bridgestp.c
projects/mips/sys/net/ethernet.h
projects/mips/sys/net/ieee8023ad_lacp.c
projects/mips/sys/net/if.c
projects/mips/sys/net/if.h
projects/mips/sys/net/if_arc.h
projects/mips/sys/net/if_arcsubr.c
projects/mips/sys/net/if_atm.h
projects/mips/sys/net/if_atmsubr.c
projects/mips/sys/net/if_bridge.c
projects/mips/sys/net/if_clone.c
projects/mips/sys/net/if_disc.c
projects/mips/sys/net/if_ef.c
projects/mips/sys/net/if_enc.c
projects/mips/sys/net/if_ethersubr.c
projects/mips/sys/net/if_faith.c
projects/mips/sys/net/if_fddisubr.c
projects/mips/sys/net/if_fwsubr.c
projects/mips/sys/net/if_gif.c
projects/mips/sys/net/if_gif.h
projects/mips/sys/net/if_gre.c
projects/mips/sys/net/if_iso88025subr.c
projects/mips/sys/net/if_lagg.c
projects/mips/sys/net/if_lagg.h
projects/mips/sys/net/if_llatbl.c
projects/mips/sys/net/if_llatbl.h
projects/mips/sys/net/if_loop.c
projects/mips/sys/net/if_mib.c
projects/mips/sys/net/if_spppsubr.c
projects/mips/sys/net/if_stf.c
projects/mips/sys/net/if_tun.c
projects/mips/sys/net/if_var.h
projects/mips/sys/net/if_vlan.c
projects/mips/sys/net/iso88025.h
projects/mips/sys/net/netisr.c
projects/mips/sys/net/radix_mpath.c
projects/mips/sys/net/route.c
projects/mips/sys/net/route.h
projects/mips/sys/net/rtsock.c
projects/mips/sys/net/vnet.h
projects/mips/sys/net80211/ieee80211.c
projects/mips/sys/net80211/ieee80211.h
projects/mips/sys/net80211/ieee80211_adhoc.c
projects/mips/sys/net80211/ieee80211_ddb.c
projects/mips/sys/net80211/ieee80211_freebsd.c
projects/mips/sys/net80211/ieee80211_freebsd.h
projects/mips/sys/net80211/ieee80211_hostap.c
projects/mips/sys/net80211/ieee80211_ht.c
projects/mips/sys/net80211/ieee80211_ht.h
projects/mips/sys/net80211/ieee80211_ioctl.c
projects/mips/sys/net80211/ieee80211_node.c
projects/mips/sys/net80211/ieee80211_node.h
projects/mips/sys/net80211/ieee80211_output.c
projects/mips/sys/net80211/ieee80211_proto.c
projects/mips/sys/net80211/ieee80211_proto.h
projects/mips/sys/net80211/ieee80211_scan.c
projects/mips/sys/net80211/ieee80211_scan.h
projects/mips/sys/net80211/ieee80211_scan_sta.c
projects/mips/sys/net80211/ieee80211_sta.c
projects/mips/sys/net80211/ieee80211_superg.c
projects/mips/sys/net80211/ieee80211_superg.h
projects/mips/sys/net80211/ieee80211_tdma.c
projects/mips/sys/net80211/ieee80211_var.h
projects/mips/sys/net80211/ieee80211_wds.c
projects/mips/sys/netatalk/at_control.c
projects/mips/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c
projects/mips/sys/netgraph/netgraph.h
projects/mips/sys/netgraph/ng_base.c
projects/mips/sys/netgraph/ng_eiface.c
projects/mips/sys/netgraph/ng_ether.c
projects/mips/sys/netgraph/ng_fec.c
projects/mips/sys/netgraph/ng_iface.c
projects/mips/sys/netinet/icmp6.h
projects/mips/sys/netinet/if_ether.c
projects/mips/sys/netinet/igmp.c
projects/mips/sys/netinet/in.c
projects/mips/sys/netinet/in_mcast.c
projects/mips/sys/netinet/in_pcb.c
projects/mips/sys/netinet/in_pcb.h
projects/mips/sys/netinet/in_rmx.c
projects/mips/sys/netinet/in_var.h
projects/mips/sys/netinet/ip_carp.c
projects/mips/sys/netinet/ip_divert.c
projects/mips/sys/netinet/ip_fastfwd.c
projects/mips/sys/netinet/ip_fw.h
projects/mips/sys/netinet/ip_fw2.c
projects/mips/sys/netinet/ip_fw_nat.c
projects/mips/sys/netinet/ip_fw_pfil.c
projects/mips/sys/netinet/ip_icmp.c
projects/mips/sys/netinet/ip_input.c
projects/mips/sys/netinet/ip_ipsec.c
projects/mips/sys/netinet/ip_mroute.c
projects/mips/sys/netinet/ip_mroute.h
projects/mips/sys/netinet/ip_output.c
projects/mips/sys/netinet/raw_ip.c
projects/mips/sys/netinet/sctp_bsd_addr.c
projects/mips/sys/netinet/sctp_crc32.c
projects/mips/sys/netinet/sctp_indata.c
projects/mips/sys/netinet/sctp_os_bsd.h
projects/mips/sys/netinet/sctp_structs.h
projects/mips/sys/netinet/tcp_hostcache.c
projects/mips/sys/netinet/tcp_subr.c
projects/mips/sys/netinet/tcp_syncache.c
projects/mips/sys/netinet/tcp_syncache.h
projects/mips/sys/netinet/tcp_timewait.c
projects/mips/sys/netinet/tcp_var.h
projects/mips/sys/netinet/udp_usrreq.c
projects/mips/sys/netinet/vinet.h
projects/mips/sys/netinet6/icmp6.c
projects/mips/sys/netinet6/in6.c
projects/mips/sys/netinet6/in6.h
projects/mips/sys/netinet6/in6_ifattach.c
projects/mips/sys/netinet6/in6_pcb.c
projects/mips/sys/netinet6/in6_proto.c
projects/mips/sys/netinet6/in6_rmx.c
projects/mips/sys/netinet6/in6_var.h
projects/mips/sys/netinet6/ip6_input.c
projects/mips/sys/netinet6/ip6_mroute.c
projects/mips/sys/netinet6/ip6_output.c
projects/mips/sys/netinet6/ip6_var.h
projects/mips/sys/netinet6/mld6.c
projects/mips/sys/netinet6/mld6_var.h
projects/mips/sys/netinet6/nd6.c
projects/mips/sys/netinet6/nd6.h
projects/mips/sys/netinet6/nd6_nbr.c
projects/mips/sys/netinet6/nd6_rtr.c
projects/mips/sys/netinet6/raw_ip6.c
projects/mips/sys/netinet6/udp6_usrreq.c
projects/mips/sys/netinet6/vinet6.h
projects/mips/sys/netipsec/ipsec.c
projects/mips/sys/netipsec/key.c
projects/mips/sys/netipsec/key.h
projects/mips/sys/netipsec/vipsec.h
projects/mips/sys/netipsec/xform_tcp.c
projects/mips/sys/netipx/ipx_outputfl.c
projects/mips/sys/netipx/spx_usrreq.c
projects/mips/sys/nfsclient/nfs_kdtrace.c
projects/mips/sys/nfsclient/nfs_krpc.c
projects/mips/sys/nfsclient/nfs_socket.c
projects/mips/sys/nfsclient/nfs_vnops.c
projects/mips/sys/pc98/cbus/clock.c
projects/mips/sys/pc98/cbus/olpt.c
projects/mips/sys/pc98/conf/GENERIC
projects/mips/sys/pci/if_rlreg.h
projects/mips/sys/powerpc/aim/machdep.c
projects/mips/sys/powerpc/aim/trap.c
projects/mips/sys/powerpc/aim/trap_subr.S
projects/mips/sys/powerpc/booke/locore.S
projects/mips/sys/powerpc/booke/machdep.c
projects/mips/sys/powerpc/booke/pmap.c
projects/mips/sys/powerpc/booke/swtch.S
projects/mips/sys/powerpc/booke/vm_machdep.c
projects/mips/sys/powerpc/conf/MPC85XX
projects/mips/sys/powerpc/include/hid.h
projects/mips/sys/powerpc/include/intr_machdep.h
projects/mips/sys/powerpc/include/param.h
projects/mips/sys/powerpc/include/pte.h
projects/mips/sys/powerpc/include/trap_aim.h
projects/mips/sys/powerpc/include/vmparam.h
projects/mips/sys/powerpc/mpc85xx/ocpbus.c
projects/mips/sys/powerpc/mpc85xx/pci_ocp.c
projects/mips/sys/powerpc/powerpc/autoconf.c
projects/mips/sys/powerpc/powerpc/bus_machdep.c
projects/mips/sys/powerpc/powerpc/cpu.c
projects/mips/sys/powerpc/powerpc/intr_machdep.c
projects/mips/sys/rpc/svc.h
projects/mips/sys/security/audit/audit.c
projects/mips/sys/security/audit/audit_bsm.c
projects/mips/sys/security/audit/audit_bsm_domain.c
projects/mips/sys/security/audit/audit_bsm_token.c
projects/mips/sys/security/audit/audit_pipe.c
projects/mips/sys/security/audit/audit_private.h
projects/mips/sys/security/audit/audit_syscalls.c
projects/mips/sys/security/mac/mac_atalk.c
projects/mips/sys/security/mac/mac_audit.c
projects/mips/sys/security/mac/mac_cred.c
projects/mips/sys/security/mac/mac_inet.c
projects/mips/sys/security/mac/mac_inet6.c
projects/mips/sys/security/mac/mac_internal.h
projects/mips/sys/security/mac/mac_net.c
projects/mips/sys/security/mac/mac_pipe.c
projects/mips/sys/security/mac/mac_posix_sem.c
projects/mips/sys/security/mac/mac_posix_shm.c
projects/mips/sys/security/mac/mac_priv.c
projects/mips/sys/security/mac/mac_process.c
projects/mips/sys/security/mac/mac_socket.c
projects/mips/sys/security/mac/mac_system.c
projects/mips/sys/security/mac/mac_sysv_msg.c
projects/mips/sys/security/mac/mac_sysv_sem.c
projects/mips/sys/security/mac/mac_sysv_shm.c
projects/mips/sys/security/mac/mac_vfs.c
projects/mips/sys/sparc64/include/param.h
projects/mips/sys/sun4v/include/param.h
projects/mips/sys/sys/acl.h
projects/mips/sys/sys/jail.h
projects/mips/sys/sys/ktr.h
projects/mips/sys/sys/malloc.h
projects/mips/sys/sys/mbuf.h
projects/mips/sys/sys/osd.h
projects/mips/sys/sys/param.h
projects/mips/sys/sys/priv.h
projects/mips/sys/sys/proc.h
projects/mips/sys/sys/queue.h
projects/mips/sys/sys/smp.h
projects/mips/sys/sys/socketvar.h
projects/mips/sys/sys/syscall.h
projects/mips/sys/sys/syscall.mk
projects/mips/sys/sys/syscallsubr.h
projects/mips/sys/sys/sysctl.h
projects/mips/sys/sys/sysproto.h
projects/mips/sys/sys/ucred.h
projects/mips/sys/sys/vimage.h
projects/mips/sys/ufs/ufs/dinode.h
projects/mips/sys/ufs/ufs/inode.h
projects/mips/sys/ufs/ufs/ufs_extern.h
projects/mips/sys/ufs/ufs/ufs_lookup.c
projects/mips/sys/ufs/ufs/ufs_vnops.c
projects/mips/sys/vm/swap_pager.c
projects/mips/sys/vm/vm_fault.c
projects/mips/sys/vm/vm_map.c
projects/mips/sys/vm/vm_object.c
projects/mips/sys/vm/vm_pageout.c
projects/mips/sys/vm/vnode_pager.c
projects/mips/sys/xen/evtchn.h (props changed)
projects/mips/sys/xen/hypervisor.h (props changed)
projects/mips/sys/xen/xen_intr.h (props changed)
projects/mips/tools/regression/acltools/tools-posix.test
projects/mips/tools/regression/lib/msun/test-conj.t (props changed)
projects/mips/tools/regression/usr.bin/pkill/pgrep-_g.t (props changed)
projects/mips/tools/regression/usr.bin/pkill/pgrep-_s.t (props changed)
projects/mips/tools/regression/usr.bin/pkill/pkill-_g.t (props changed)
projects/mips/tools/tools/ath/common/dumpregs.h (props changed)
projects/mips/tools/tools/ath/common/dumpregs_5210.c (props changed)
projects/mips/tools/tools/ath/common/dumpregs_5211.c (props changed)
projects/mips/tools/tools/ath/common/dumpregs_5212.c (props changed)
projects/mips/tools/tools/ath/common/dumpregs_5416.c (props changed)
projects/mips/tools/tools/nanobsd/gateworks/G2348
projects/mips/tools/tools/nanobsd/gateworks/G2358
projects/mips/tools/tools/nanobsd/gateworks/common
projects/mips/tools/tools/net80211/scripts/setup.wdsmain
projects/mips/tools/tools/net80211/wlanwds/wlanwds.c
projects/mips/usr.bin/calendar/calendars/calendar.freebsd
projects/mips/usr.bin/cpio/Makefile
projects/mips/usr.bin/cpio/bsdcpio.1
projects/mips/usr.bin/cpio/cmdline.c
projects/mips/usr.bin/cpio/cpio.c
projects/mips/usr.bin/cpio/cpio.h
projects/mips/usr.bin/cpio/cpio_platform.h
projects/mips/usr.bin/cpio/pathmatch.c
projects/mips/usr.bin/cpio/pathmatch.h
projects/mips/usr.bin/cpio/test/main.c
projects/mips/usr.bin/cpio/test/test.h
projects/mips/usr.bin/cpio/test/test_0.c
projects/mips/usr.bin/cpio/test/test_basic.c
projects/mips/usr.bin/cpio/test/test_format_newc.c
projects/mips/usr.bin/cpio/test/test_gcpio_compat.c
projects/mips/usr.bin/cpio/test/test_option_a.c
projects/mips/usr.bin/cpio/test/test_option_c.c
projects/mips/usr.bin/cpio/test/test_option_d.c
projects/mips/usr.bin/cpio/test/test_option_f.c
projects/mips/usr.bin/cpio/test/test_option_m.c
projects/mips/usr.bin/cpio/test/test_option_t.c
projects/mips/usr.bin/cpio/test/test_option_u.c
projects/mips/usr.bin/cpio/test/test_option_version.c
projects/mips/usr.bin/cpio/test/test_option_y.c
projects/mips/usr.bin/cpio/test/test_option_z.c
projects/mips/usr.bin/cpio/test/test_owner_parse.c
projects/mips/usr.bin/cpio/test/test_passthrough_dotdot.c
projects/mips/usr.bin/cpio/test/test_passthrough_reverse.c
projects/mips/usr.bin/cpio/test/test_pathmatch.c
projects/mips/usr.bin/csup/ (props changed)
projects/mips/usr.bin/du/du.c
projects/mips/usr.bin/file/Makefile
projects/mips/usr.bin/login/login_audit.c
projects/mips/usr.bin/ncal/Makefile
projects/mips/usr.bin/ncal/ncal.1
projects/mips/usr.bin/ncal/ncal.c
projects/mips/usr.bin/netstat/inet6.c
projects/mips/usr.bin/netstat/mroute.c
projects/mips/usr.bin/procstat/ (props changed)
projects/mips/usr.bin/tar/Makefile
projects/mips/usr.bin/tar/bsdtar.1
projects/mips/usr.bin/tar/bsdtar.c
projects/mips/usr.bin/tar/bsdtar.h
projects/mips/usr.bin/tar/bsdtar_platform.h
projects/mips/usr.bin/tar/cmdline.c
projects/mips/usr.bin/tar/read.c
projects/mips/usr.bin/tar/test/main.c
projects/mips/usr.bin/tar/test/test.h
projects/mips/usr.bin/tar/test/test_0.c
projects/mips/usr.bin/tar/test/test_basic.c
projects/mips/usr.bin/tar/test/test_copy.c
projects/mips/usr.bin/tar/test/test_patterns.c
projects/mips/usr.bin/tar/test/test_strip_components.c
projects/mips/usr.bin/tar/test/test_symlink_dir.c
projects/mips/usr.bin/tar/tree.c
projects/mips/usr.bin/tar/util.c
projects/mips/usr.bin/tar/write.c
projects/mips/usr.bin/truss/main.c
projects/mips/usr.bin/truss/setup.c
projects/mips/usr.sbin/Makefile
projects/mips/usr.sbin/arp/arp.8
projects/mips/usr.sbin/bluetooth/btpand/event.c
projects/mips/usr.sbin/cpucontrol/cpucontrol.8
projects/mips/usr.sbin/crashinfo/crashinfo.8
projects/mips/usr.sbin/dumpcis/cardinfo.h (props changed)
projects/mips/usr.sbin/dumpcis/cis.h (props changed)
projects/mips/usr.sbin/freebsd-update/freebsd-update.8
projects/mips/usr.sbin/ifmcstat/ifmcstat.c
projects/mips/usr.sbin/jail/jail.c
projects/mips/usr.sbin/kbdmap/kbdmap.1
projects/mips/usr.sbin/makefs/ffs/ffs_bswap.c (props changed)
projects/mips/usr.sbin/makefs/ffs/ffs_subr.c (props changed)
projects/mips/usr.sbin/makefs/ffs/ufs_bswap.h (props changed)
projects/mips/usr.sbin/makefs/getid.c (props changed)
projects/mips/usr.sbin/mtest/Makefile
projects/mips/usr.sbin/mtest/mtest.8
projects/mips/usr.sbin/mtest/mtest.c
projects/mips/usr.sbin/pciconf/cap.c
projects/mips/usr.sbin/pkg_install/add/main.c
projects/mips/usr.sbin/ppp/iface.c
projects/mips/usr.sbin/ppp/ipcp.c
projects/mips/usr.sbin/ppp/ipv6cp.c
projects/mips/usr.sbin/ppp/route.c
projects/mips/usr.sbin/ppp/route.h
projects/mips/usr.sbin/setfib/setfib.1
projects/mips/usr.sbin/sysinstall/devices.c
projects/mips/usr.sbin/sysinstall/index.c
projects/mips/usr.sbin/sysinstall/menus.c
projects/mips/usr.sbin/zic/ (props changed)
Modified: projects/mips/ObsoleteFiles.inc
==============================================================================
--- projects/mips/ObsoleteFiles.inc Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/ObsoleteFiles.inc Wed May 6 22:40:01 2009 (r191863)
@@ -14,8 +14,31 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20090417: removal of legacy versions of USB network interface drivers
+OLD_FILES+=usr/include/legacy/dev/usb/if_auereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_axereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_cdcereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_cuereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_kuereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_ruereg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_rumreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_rumvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_udavreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_uralreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_uralvar.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_zydfw.h
+OLD_FILES+=usr/include/legacy/dev/usb/if_zydreg.h
+OLD_FILES+=usr/include/legacy/dev/usb/kue_fw.h
+# 20090416: removal of ar(4), ray(4), sr(4), raycontrol(8)
+OLD_FILES+=usr/sbin/raycontrol
+OLD_FILES+=usr/share/man/man4/i386/ar.4.gz
+OLD_FILES+=usr/share/man/man4/i386/ray.4.gz
+OLD_FILES+=usr/share/man/man4/i386/sr.4.gz
+OLD_FILES+=usr/share/man/man8/raycontrol.8.gz
# 20090410: VOP_LEASE.9 removed
OLD_FILES+=usr/share/man/man9/VOP_LEASE.9.gz
+# 20090406: usb_sw_transfer.h removed
+OLD_FILES+=usr/include/dev/usb/usb_sw_transfer.h
# 20090405: removal of if_ppp(4) and if_sl(4)
OLD_FILES+=sbin/slattach rescue/slattach
OLD_FILES+=sbin/startslip rescue/startslip
@@ -54,6 +77,7 @@ OLD_FILES+=usr/lib/libusb20.a
OLD_FILES+=usr/lib/libusb20.so
OLD_FILES+=usr/lib/libusb20_p.a
OLD_FILES+=usr/include/libusb20_compat01.h
+OLD_FILES+=usr/include/libusb20_compat10.h
.if ${TARGET_ARCH} == "amd64"
OLD_LIBS+=usr/lib32/libusb20.so.1
OLD_FILES+=usr/lib32/libusb20.a
@@ -97,6 +121,8 @@ OLD_FILES+=usr/include/dev/usb/if_udavre
OLD_FILES+=usr/include/dev/usb/if_upgtvar.h
OLD_FILES+=usr/include/dev/usb/if_uralreg.h
OLD_FILES+=usr/include/dev/usb/if_uralvar.h
+OLD_FILES+=usr/include/dev/usb/if_urtwreg.h
+OLD_FILES+=usr/include/dev/usb/if_urtwvar.h
OLD_FILES+=usr/include/dev/usb/if_zydfw.h
OLD_FILES+=usr/include/dev/usb/if_zydreg.h
OLD_FILES+=usr/include/dev/usb/kue_fw.h
Modified: projects/mips/UPDATING
==============================================================================
--- projects/mips/UPDATING Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/UPDATING Wed May 6 22:40:01 2009 (r191863)
@@ -22,6 +22,129 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090430:
+ The layout of the following structs has changed: sysctl_oid,
+ socket, ifnet, inpcbinfo, tcpcb, syncache_head, vnet_inet,
+ vnet_inet6 and vnet_ipfw. Most modules need to be rebuild or
+ panics may be experienced. World rebuild is required for
+ correctly checking networking state from userland.
+ Bump __FreeBSD_version to 800085.
+
+20090429:
+ MLDv2 and Source-Specific Multicast (SSM) have been merged
+ to the IPv6 stack. VIMAGE hooks are in but not yet used.
+ The implementation of SSM within FreeBSD's IPv6 stack closely
+ follows the IPv4 implementation.
+
+ For kernel developers:
+
+ * The most important changes are that the ip6_output() and
+ ip6_input() paths no longer take the IN6_MULTI_LOCK,
+ and this lock has been downgraded to a non-recursive mutex.
+
+ * As with the changes to the IPv4 stack to support SSM, filtering
+ of inbound multicast traffic must now be performed by transport
+ protocols within the IPv6 stack. This does not apply to TCP and
+ SCTP, however, it does apply to UDP in IPv6 and raw IPv6.
+
+ * The KPIs used by IPv6 multicast are similar to those used by
+ the IPv4 stack, with the following differences:
+ * im6o_mc_filter() is analogous to imo_multicast_filter().
+ * The legacy KAME entry points in6_joingroup and in6_leavegroup()
+ are shimmed to in6_mc_join() and in6_mc_leave() respectively.
+ * IN6_LOOKUP_MULTI() has been deprecated and removed.
+ * IPv6 relies on MLD for the DAD mechanism. KAME's internal KPIs
+ for MLDv1 have an additional 'timer' argument which is used to
+ jitter the initial membership report for the solicited-node
+ multicast membership on-link.
+ * This is not strictly needed for MLDv2, which already jitters
+ its report transmissions. However, the 'timer' argument is
+ preserved in case MLDv1 is active on the interface.
+
+ * The KAME linked-list based IPv6 membership implementation has
+ been refactored to use a vector similar to that used by the IPv4
+ stack.
+ Code which maintains a list of its own multicast memberships
+ internally, e.g. carp, has been updated to reflect the new
+ semantics.
+
+ * There is a known Lock Order Reversal (LOR) due to in6_setscope()
+ acquiring the IF_AFDATA_LOCK and being called within ip6_output().
+ Whilst MLDv2 tries to avoid this otherwise benign LOR, it is an
+ implementation constraint which needs to be addressed in HEAD.
+
+ For application developers:
+
+ * The changes are broadly similar to those made for the IPv4
+ stack.
+
+ * The use of IPv4 and IPv6 multicast socket options on the same
+ socket, using mapped addresses, HAS NOT been tested or supported.
+
+ * There are a number of issues with the implementation of various
+ IPv6 multicast APIs which need to be resolved in the API surface
+ before the implementation is fully compatible with KAME userland
+ use, and these are mostly to do with interface index treatment.
+
+ * The literature available discusses the use of either the delta / ASM
+ API with setsockopt(2)/getsockopt(2), or the full-state / ASM API
+ using setsourcefilter(3)/getsourcefilter(3). For more information
+ please refer to RFC 3768, 'Socket Interface Extensions for
+ Multicast Source Filters'.
+
+ * Applications which use the published RFC 3678 APIs should be fine.
+
+ For systems administrators:
+
+ * The mtest(8) utility has been refactored to support IPv6, in
+ addition to IPv4. Interface addresses are no longer accepted
+ as arguments, their names must be used instead. The utility
+ will map the interface name to its first IPv4 address as
+ returned by getifaddrs(3).
+
+ * The ifmcstat(8) utility has also been updated to print the MLDv2
+ endpoint state and source filter lists via sysctl(3).
+
+ * The net.inet6.ip6.mcast.loop sysctl may be tuned to 0 to disable
+ loopback of IPv6 multicast datagrams by default; it defaults to 1
+ to preserve the existing behaviour. Disabling multicast loopback is
+ recommended for optimal system performance.
+
+ * The IPv6 MROUTING code has been changed to examine this sysctl
+ instead of attempting to perform a group lookup before looping
+ back forwarded datagrams.
+
+ Bump __FreeBSD_version to 800084.
+
+20090422:
+ Implement low-level Bluetooth HCI API.
+ Bump __FreeBSD_version to 800083.
+
+20090419:
+ The layout of struct malloc_type, used by modules to register new
+ memory allocation types, has changed. Most modules will need to
+ be rebuilt or panics may be experienced.
+ Bump __FreeBSD_version to 800081.
+
+20090415:
+ Anticipate overflowing inp_flags - add inp_flags2.
+ This changes most offsets in inpcb, so checking v4 connection
+ state will require a world rebuild.
+ Bump __FreeBSD_version to 800080.
+
+20090415:
+ Add an llentry to struct route and struct route_in6. Modules
+ embedding a struct route will need to be recompiled.
+ Bump __FreeBSD_version to 800079.
+
+20090414:
+ The size of rt_metrics_lite and by extension rtentry has changed.
+ Networking administration apps will need to be recompiled.
+ The route command now supports show as an alias for get, weighting
+ of routes, sticky and nostick flags to alter the behavior of stateful
+ load balancing.
+ Bump __FreeBSD_version to 800078.
+
20090408:
Do not use Giant for kbdmux(4) locking. This is wrong and
apparently causing more problems than it solves. This will
@@ -41,7 +164,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
GEOM_PART has become the default partition slicer for storage devices,
replacing GEOM_MBR, GEOM_BSD, GEOM_PC98 and GEOM_GPT slicers. It
introduces some changes:
-
+
MSDOS/EBR: the devices created from MSDOS extended partition entries
(EBR) can be named differently than with GEOM_MBR and are now symlinks
to devices with offset-based names. fstabs may need to be modified.
@@ -50,7 +173,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
cases but it points to problems in file system misalignment with
disk geometry. The "c" partition is now implicit, covers the whole
top-level drive and cannot be (mis)used by users.
-
+
General: Kernel dumps are now not allowed to be written to devices
whose partition types indicate they are meant to be used for file
systems (or, in case of MSDOS partitions, as something else than
Modified: projects/mips/bin/ls/ls.1
==============================================================================
--- projects/mips/bin/ls/ls.1 Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/bin/ls/ls.1 Wed May 6 22:40:01 2009 (r191863)
@@ -680,6 +680,7 @@ specification.
.Xr sort 1 ,
.Xr xterm 1 ,
.Xr strftime 3 ,
+.Xr strmode 3 ,
.Xr termcap 5 ,
.Xr maclabel 7 ,
.Xr symlink 7 ,
Modified: projects/mips/bin/rm/rm.c
==============================================================================
--- projects/mips/bin/rm/rm.c Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/bin/rm/rm.c Wed May 6 22:40:01 2009 (r191863)
@@ -60,6 +60,7 @@ __FBSDID("$FreeBSD$");
int dflag, eval, fflag, iflag, Pflag, vflag, Wflag, stdin_ok;
int rflag, Iflag;
uid_t uid;
+volatile sig_atomic_t info;
int check(char *, char *, struct stat *);
int check2(char **);
@@ -68,6 +69,7 @@ void checkslash(char **);
void rm_file(char **);
int rm_overwrite(char *, struct stat *);
void rm_tree(char **);
+static void siginfo(int __unused);
void usage(void);
/*
@@ -150,6 +152,7 @@ main(int argc, char *argv[])
checkslash(argv);
uid = geteuid();
+ (void)signal(SIGINFO, siginfo);
if (*argv) {
stdin_ok = isatty(STDIN_FILENO);
@@ -266,6 +269,11 @@ rm_tree(char **argv)
if (rval == 0 && vflag)
(void)printf("%s\n",
p->fts_path);
+ if (rval == 0 && info) {
+ info = 0;
+ (void)printf("%s\n",
+ p->fts_path);
+ }
continue;
}
break;
@@ -276,6 +284,11 @@ rm_tree(char **argv)
if (vflag)
(void)printf("%s\n",
p->fts_path);
+ if (info) {
+ info = 0;
+ (void)printf("%s\n",
+ p->fts_path);
+ }
continue;
}
break;
@@ -297,6 +310,11 @@ rm_tree(char **argv)
if (rval == 0 && vflag)
(void)printf("%s\n",
p->fts_path);
+ if (rval == 0 && info) {
+ info = 0;
+ (void)printf("%s\n",
+ p->fts_path);
+ }
continue;
}
}
@@ -369,6 +387,10 @@ rm_file(char **argv)
}
if (vflag && rval == 0)
(void)printf("%s\n", f);
+ if (info && rval == 0) {
+ info = 0;
+ (void)printf("%s\n", f);
+ }
}
}
@@ -592,3 +614,10 @@ usage(void)
" unlink file");
exit(EX_USAGE);
}
+
+static void
+siginfo(int sig __unused)
+{
+
+ info = 1;
+}
Modified: projects/mips/bin/sh/parser.c
==============================================================================
--- projects/mips/bin/sh/parser.c Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/bin/sh/parser.c Wed May 6 22:40:01 2009 (r191863)
@@ -250,6 +250,7 @@ pipeline(void)
int negate;
negate = 0;
+ checkkwd = 2;
TRACE(("pipeline: entered\n"));
while (readtoken() == TNOT)
negate = !negate;
Modified: projects/mips/contrib/file/ChangeLog
==============================================================================
--- projects/mips/contrib/file/ChangeLog Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/contrib/file/ChangeLog Wed May 6 22:40:01 2009 (r191863)
@@ -1,9 +1,105 @@
+2008-12-12 15:50 Christos Zoulas <christos@zoulas.com>
+
+ * fix initial offset calculation for non 4K sector files
+
+ * add loop limits to avoid DoS attacks by constructing
+ looping sector references.
+
+2008-12-03 13:05 Christos Zoulas <christos@zoulas.com>
+
+ * fix memory botches on cdf file parsing.
+
+ * exit with non-zero value for any error, not just for the last
+ file processed.
+
+2008-11-09 20:42 Charles Longeau <chl@tuxfamily.org>
+
+ * Replace all str{cpy,cat} functions with strl{cpy,cat}
+ * Ensure that strl{cpy,cat} are included in libmagic,
+ as needed.
+
+2008-11-06 18:18 Christos Zoulas <christos@zoulas.com>
+
+ * Handle ID3 format files.
+
+2008-11-06 23:00 Reuben Thomas <rrt@sc3d.org>
+
+ * Fix --mime, --mime-type and --mime-encoding under new scheme.
+
+ * Rename "ascii" to "text" and add "encoding" test.
+
+ * Return a precise ("utf-16le" or "utf-16be") MIME charset for
+ UTF-16.
+
+ * Fix error in comment caused by automatic indentation adding
+ words!
+
+2008-11-06 10:35 Christos Zoulas <christos@astron.com>
+
+ * use memchr instead of strchr because the string
+ might not be NUL terminated (Scott MacVicar)
+
+2008-11-03 07:31 Reuben Thomas <rrt@sc3d.org>
+
+ * Fix a printf with a non-literal format string.
+
+ * Fix formatting and punctuation of help for "--apple".
+
+2008-10-30 11:00 Reuben Thomas <rrt@sc3d.org>
+
+ * Correct words counts in comments of struct magic.
+
+ * Fix handle_annotation to allow both Apple and MIME types to be
+ printed, and to return correct code if MIME type is
+ printed (1, not 0) or if there's an error (-1 not 1).
+
+ * Fix output of charset for MIME type (precede with semi-colon;
+ fixes Debian bug #501460).
+
+ * Fix potential attacks via conversion specifications in magic
+ strings.
+
+ * Add a FIXME for Debian bug #488562 (magic files should be
+ read in a defined order, by sorting the names).
+
+2008-10-18 16:45 Christos Zoulas <christos@astron.com>
+
+ * Added APPLE file creator/type
+
+2008-10-12 10:20 Christos Zoulas <christos@astron.com>
+
+ * Added CDF parsing
+
+2008-10-09 16:40 Christos Zoulas <christos@astron.com>
+
+ * filesystem and msdos patches (Joerg Jenderek)
+
+2008-10-09 13:20 Christos Zoulas <christos@astron.com>
+
+ * correct --exclude documentation issues: remove troff and fortran
+ and rename "token" to "tokens". (Randy McMurchy)
+
+2008-10-01 10:30 Christos Zoulas <christos@astron.com>
+
+ * Read ~/.magic in addition to the default magic file not instead
+ of, as documented in the man page.
+
+2008-09-10 21:30 Reuben Thomas <rrt@sc3d.org>
+
+ * Comment out graphviz patterns, as they match too many files.
+
2008-08-30 12:54 Christos Zoulas <christos@astron.com>
* Don't eat trailing \n in magic enties.
* Cast defines to allow compilation using a c++ compiler.
+2008-08-25 23:56 Reuben Thomas <rrt@sc3d.org>
+
+ * Add text/x-lua MIME type for Lua scripts.
+
+ * Escape { in regex in graphviz patterns.
+
2008-07-26 00:59 Reuben Thomas <rrt@sc3d.org>
* Add MIME types for special files.
@@ -55,22 +151,22 @@
2008-05-06 00:13 Robert Byrnes <byrnes@wildpumpkin.net>
- * src/Makefile.am:
+ * src/Makefile.am:
Ensure that getopt_long and [v]asprintf are included in libmagic,
as needed.
Remove unnecessary EXTRA_DIST.
- * src/Makefile.in:
+ * src/Makefile.in:
Rerun automake.
- * src/vasprintf.c (dispatch):
+ * src/vasprintf.c (dispatch):
Fix variable precision bug: be sure to step past '*'.
- * src/vasprintf.c (core):
+ * src/vasprintf.c (core):
Remove unreachable code.
- * src/apprentice.c (set_test_type):
+ * src/apprentice.c (set_test_type):
Add cast to avoid compiler warning.
2008-04-22 23:45 Christos Zoulas <christos@astron.com>
@@ -81,12 +177,12 @@
2008-04-04 11:00 Christos Zoulas <christos@astron.com>
- * >= <= is not supported, so fix the magic and warn about it.
+ * >= <= is not supported, so fix the magic and warn about it.
reported by: Thien-Thi Nguyen <ttn@gnuvola.org>
2008-03-27 16:16 Robert Byrnes <byrnes@wildpumpkin.net>
- * src/readelf.c (donote):
+ * src/readelf.c (donote):
ELF core file command name/line bug fixes and enhancements:
Try larger offsets first to avoid false matches
@@ -112,7 +208,7 @@
* Clarify UTF-8 BOM message (Reuben Thomas)
* Add HTML comment to token list in names.h
-
+
2007-02-04 15:50 Christos Zoulas <christos@astron.com>
* Debian fixes (Reuben Thomas)
@@ -152,7 +248,7 @@
2007-10-28 20:48 Christos Zoulas <christos@astron.com>
- * float and double magic support (Behan Webster)
+ * float and double magic support (Behan Webster)
2007-10-28 20:48 Christos Zoulas <christos@astron.com>
@@ -199,7 +295,7 @@
be easily parsed:
mimetype [charset=character-set] [encoding=encoding-mime-type]
- Remove spurious extra text from some MIME type printouts
+ Remove spurious extra text from some MIME type printouts
(mostly in is_tar).
Fix one case where -i produced nothing at all (for a 1-byte file,
@@ -229,7 +325,7 @@
2007-03-15 10:51 Christos Zoulas <christos@astron.com>
* fix fortran and nroff reversed tests (Dmitry V. Levin)
-
+
* fix exclude option (Dmitry V. Levin)
2007-02-08 17:30 Christos Zoulas <christos@astron.com>
@@ -248,7 +344,7 @@
* Add exclude flag.
2007-01-18 05:29 Anon Ymous <do@not.spam.me>
-
+
* Move the "type" detection code from parse() into its own table
driven routine. This avoids maintaining multiple lists in
file.h.
@@ -256,7 +352,7 @@
* Add an optional conditional field (ust before the type field).
This code is wrapped in "#ifdef ENABLE_CONDITIONALS" as it is
likely to go away.
-
+
2007-01-16 23:24 Anon Ymous <do@not.spam.me>
* Fix an initialization bug in check_mem().
@@ -327,7 +423,7 @@
2006-12-08 16:32 Christos Zoulas <christos@astron.com>
* store and print the line number of the magic
- entry for debugging.
+ entry for debugging.
* if the magic entry did not print anything,
don't treat it as a match
@@ -342,7 +438,7 @@
file_softmagic.
2006-11-25 13:35 Christos Zoulas <christos@astron.com>
-
+
* Don't store the current offset in the magic
struct, because it needs to be restored and
it was not done properly all the time. Bug
@@ -432,7 +528,7 @@
* Look for note sections in non executables.
2005-09-20 13:33 Christos Zoulas <christos@astron.com>
-
+
* Don't print SVR4 Style in core files multiple times
(Radek Vokál)
@@ -443,9 +539,9 @@
2005-08-18 09:53 Christos Zoulas <christos@astron.com>
* Remove erroreous mention of /etc/magic in the file man page
- This is gentoo bug 101639. (Mike Frysinger)
+ This is gentoo bug 101639. (Mike Frysinger)
- * Cross-compile support and detection (Mike Frysinger)
+ * Cross-compile support and detection (Mike Frysinger)
2005-08-12 10:17 Christos Zoulas <christos@astron.com>
@@ -477,20 +573,20 @@
* Avoid NULL pointer dereference in time conversion.
2005-03-06 00:00 Joerg Walter <jwalt@mail.garni.ch>
-
+
* Add indirect magic offset support, and search mode.
2005-01-12 00:00 Stepan Kasal <kasal@ucw.cz>
- * src/ascmagic.c (file_ascmagic): Fix three bugs about text files:
- If a CRLF text file happens to have CR at offset HOWMANY - 1
- (currently 0xffff), it should not be counted as CR line
- terminator.
- If a line has length exactly MAXLINELEN, it should not yet be
- treated as a ``very long line'', as MAXLINELEN is ``longest sane
- line length''.
- With CRLF, the line length was not computed correctly, and even
- lines of length MAXLINELEN - 1 were treated as ``very long''.
+ * src/ascmagic.c (file_ascmagic): Fix three bugs about text files:
+ If a CRLF text file happens to have CR at offset HOWMANY - 1
+ (currently 0xffff), it should not be counted as CR line
+ terminator.
+ If a line has length exactly MAXLINELEN, it should not yet be
+ treated as a ``very long line'', as MAXLINELEN is ``longest sane
+ line length''.
+ With CRLF, the line length was not computed correctly, and even
+ lines of length MAXLINELEN - 1 were treated as ``very long''.
2004-12-07 14:15 Christos Zoulas <christos@astron.com>
@@ -525,12 +621,12 @@
* Remove 3rd and 4th copyright clause; approved by Ian Darwin.
- * Fix small memory leaks; caught by: Tamas Sarlos
+ * Fix small memory leaks; caught by: Tamas Sarlos
<stamas@csillag.ilab.sztaki.hu>
2004-07-24 16:33 Christos Zoulas <christos@astron.com>
- * magic.mime update Danny Milosavljevic <danny.milo@gmx.net>
+ * magic.mime update Danny Milosavljevic <danny.milo@gmx.net>
* FreeBSD version update Oliver Eikemeier <eikemeier@fillmore-labs.com>
Modified: projects/mips/contrib/file/Magdir/animation
==============================================================================
--- projects/mips/contrib/file/Magdir/animation Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/contrib/file/Magdir/animation Wed May 6 22:40:01 2009 (r191863)
@@ -325,6 +325,7 @@
# MP2, M1A
0 beshort&0xFFFE 0xFFFC MPEG ADTS, layer II, v1
+!:mime audio/mpeg
# rates
>2 byte&0xF0 0x10 \b, 32 kbps
>2 byte&0xF0 0x20 \b, 48 kbps
@@ -399,6 +400,7 @@
# MP3, M2A
0 beshort&0xFFFE 0xFFF2 MPEG ADTS, layer III, v2
+!:mime audio/mpeg
# rate
>2 byte&0xF0 0x10 \b, 8 kbps
>2 byte&0xF0 0x20 \b, 16 kbps
@@ -790,3 +792,24 @@
0 belong 0x00000001
>4 byte&0x1F 0x07
!:mime video/h264
+
+# Type: Bink Video
+# URL: http://wiki.multimedia.cx/index.php?title=3DBink_Container
+# From: <hoehle@users.sourceforge.net> 2008-07-18
+0 string BIK Bink Video
+>3 regex =[a-z] rev.%s
+#>4 ulelong x size %d
+>20 ulelong x \b, %d
+>24 ulelong x \bx%d
+>8 ulelong x \b, %d frames
+>32 ulelong x at rate %d/
+>28 ulelong >1 \b%d
+>40 ulelong =0 \b, no audio
+>40 ulelong !0 \b, %d audio track
+>>40 ulelong !1 \bs
+# follow properties of the first audio track only
+>>48 uleshort x %dHz
+>>51 byte&0x20 0 mono
+>>51 byte&0x20 !0 stereo
+#>>51 byte&0x10 0 FFT
+#>>51 byte&0x10 !0 DCT
Modified: projects/mips/contrib/file/Magdir/audio
==============================================================================
--- projects/mips/contrib/file/Magdir/audio Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/contrib/file/Magdir/audio Wed May 6 22:40:01 2009 (r191863)
@@ -286,43 +286,14 @@
# SGI SoundTrack <mpruett@sgi.com>
0 string _SGI_SoundTrack SGI SoundTrack project file
# ID3 version 2 tags <waschk@informatik.uni-rostock.de>
-0 string ID3 Audio file with ID3 version 2.
-# ??? Normally such a file is an MP3 file, but this will give false positives
-!:mime audio/mpeg
->3 ubyte <0xff \b%d
-#>4 ubyte <0xff \b%d tag
->2584 string fLaC \b, FLAC encoding
->>2588 byte&0x7f >0 \b, unknown version
->>2588 byte&0x7f 0 \b
-# some common bits/sample values
->>>2600 beshort&0x1f0 0x030 \b, 4 bit
->>>2600 beshort&0x1f0 0x050 \b, 6 bit
->>>2600 beshort&0x1f0 0x070 \b, 8 bit
->>>2600 beshort&0x1f0 0x0b0 \b, 12 bit
->>>2600 beshort&0x1f0 0x0f0 \b, 16 bit
->>>2600 beshort&0x1f0 0x170 \b, 24 bit
->>>2600 byte&0xe 0x0 \b, mono
->>>2600 byte&0xe 0x2 \b, stereo
->>>2600 byte&0xe 0x4 \b, 3 channels
->>>2600 byte&0xe 0x6 \b, 4 channels
->>>2600 byte&0xe 0x8 \b, 5 channels
->>>2600 byte&0xe 0xa \b, 6 channels
->>>2600 byte&0xe 0xc \b, 7 channels
->>>2600 byte&0xe 0xe \b, 8 channels
-# some common sample rates
->>>2597 belong&0xfffff0 0x0ac440 \b, 44.1 kHz
->>>2597 belong&0xfffff0 0x0bb800 \b, 48 kHz
->>>2597 belong&0xfffff0 0x07d000 \b, 32 kHz
->>>2597 belong&0xfffff0 0x056220 \b, 22.05 kHz
->>>2597 belong&0xfffff0 0x05dc00 \b, 24 kHz
->>>2597 belong&0xfffff0 0x03e800 \b, 16 kHz
->>>2597 belong&0xfffff0 0x02b110 \b, 11.025 kHz
->>>2597 belong&0xfffff0 0x02ee00 \b, 12 kHz
->>>2597 belong&0xfffff0 0x01f400 \b, 8 kHz
->>>2597 belong&0xfffff0 0x177000 \b, 96 kHz
->>>2597 belong&0xfffff0 0x0fa000 \b, 64 kHz
->>>2601 byte&0xf >0 \b, >4G samples
->2584 string !fLaC \b, MP3 encoding
+0 string ID3 Audio file with ID3 version 2
+>3 byte x \b.%d
+>4 byte x \b.%d
+>>5 byte &0x80 \b, unsynchronized frames
+>>5 byte &0x40 \b, extended header
+>>5 byte &0x20 \b, experimental
+>>5 byte &0x10 \b, footer present
+>(6.I) indirect x \b, contains:
# NSF (NES sound file) magic
0 string NESM\x1a NES Sound File
Modified: projects/mips/contrib/file/Magdir/cafebabe
==============================================================================
--- projects/mips/contrib/file/Magdir/cafebabe Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/contrib/file/Magdir/cafebabe Wed May 6 22:40:01 2009 (r191863)
@@ -12,16 +12,18 @@
# (and use as a hack). Let's not use 18, because the Mach-O people
# might add another one or two as time goes by...
#
-0 beshort 0xcafe
->2 beshort 0xbabe
+0 belong 0xcafebabe
!:mime application/x-java-applet
->>2 belong >30 compiled Java class data,
->>>6 beshort x version %d.
->>>4 beshort x \b%d
->>4 belong 1 Mach-O fat file with 1 architecture
->>4 belong >1
->>>4 belong <20 Mach-O fat file with %ld architectures
->2 beshort 0xd00d JAR compressed with pack200,
+>4 belong >30 compiled Java class data,
+>>6 beshort x version %d.
+>>4 beshort x \b%d
+
+0 belong 0xcafebabe
+>4 belong 1 Mach-O fat file with 1 architecture
+>4 belong >1
+>>4 belong <20 Mach-O fat file with %ld architectures
+
+0 belong 0xcafed00d JAR compressed with pack200,
>>5 byte x version %d.
>>4 byte x \b%d
!:mime application/x-java-pack200
Modified: projects/mips/contrib/file/Magdir/compress
==============================================================================
--- projects/mips/contrib/file/Magdir/compress Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/contrib/file/Magdir/compress Wed May 6 22:40:01 2009 (r191863)
@@ -11,6 +11,7 @@
# standard unix compress
0 string \037\235 compress'd data
!:mime application/x-compress
+!:apple LZIVZIVU
>2 byte&0x80 >0 block compressed
>2 byte&0x1f x %d bits
@@ -76,6 +77,11 @@
!:mime application/x-bzip2
>3 byte >47 \b, block size = %c00k
+# lzip
+0 string LZIP lzip compressed data
+!:mime application/x-lzip
+>4 byte x \b, version: %d
+
# squeeze and crunch
# Michael Haardt <michael@cantor.informatik.rwth-aachen.de>
0 beshort 0x76FF squeezed data,
Modified: projects/mips/contrib/file/Magdir/elf
==============================================================================
--- projects/mips/contrib/file/Magdir/elf Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/contrib/file/Magdir/elf Wed May 6 22:40:01 2009 (r191863)
@@ -143,11 +143,13 @@
>>18 leshort 91 picoJava,
>>18 leshort 92 OpenRISC,
>>18 leshort 93 ARC Cores Tangent-A5,
->>18 leshort 0x3426 OpenRISC (obsolete),
->>18 leshort 0x8472 OpenRISC (obsolete),
>>18 leshort 94 Tensilica Xtensa,
>>18 leshort 97 NatSemi 32k,
>>18 leshort 106 Analog Devices Blackfin,
+>>18 leshort 113 Altera Nios II,
+>>18 leshort 0xae META,
+>>18 leshort 0x3426 OpenRISC (obsolete),
+>>18 leshort 0x8472 OpenRISC (obsolete),
>>18 leshort 0x9026 Alpha (unofficial),
>>20 lelong 0 invalid version
>>20 lelong 1 version 1
Modified: projects/mips/contrib/file/Magdir/epoc
==============================================================================
--- projects/mips/contrib/file/Magdir/epoc Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/contrib/file/Magdir/epoc Wed May 6 22:40:01 2009 (r191863)
@@ -1,10 +1,11 @@
-
#------------------------------------------------------------------------------
-# Epoc 32 : file(1) magic for Epoc Documents [psion/osaris
+# EPOC : file(1) magic for EPOC documents [Psion Series 5/Osaris/Geofox 1]
# Stefan Praszalowicz (hpicollo@worldnet.fr)
-#0 lelong 0x10000037 Epoc32
+# Useful information for improving this file can be found at:
+# http://software.frodo.looijaard.name/psiconv/formats/Index.html
+0 lelong 0x10000037
>4 lelong 0x1000006D
->>8 lelong 0x1000007F Word
->>8 lelong 0x10000088 Sheet
->>8 lelong 0x1000007D Sketch
->>8 lelong 0x10000085 TextEd
+>>8 lelong 0x1000007F Psion Word
+>>8 lelong 0x10000088 Psion Sheet
+>>8 lelong 0x1000007D Psion Sketch
+>>8 lelong 0x10000085 Psion TextEd
Modified: projects/mips/contrib/file/Magdir/filesystems
==============================================================================
--- projects/mips/contrib/file/Magdir/filesystems Wed May 6 22:31:04 2009 (r191862)
+++ projects/mips/contrib/file/Magdir/filesystems Wed May 6 22:40:01 2009 (r191863)
@@ -104,9 +104,32 @@
>>>346 string des\ Betriebssystems
>>>>366 string Betriebssystem\ nicht\ vorhanden \b, Microsoft Windows XP MBR (german)
>>>>>0x1B8 ulelong >0 \b, Serial 0x%-.4x
->0x145 string Default:\ F \b, FREE-DOS MBR
+#>0x145 string Default:\ F \b, FREE-DOS MBR
+#>0x14B string Default:\ F \b, FREE-DOS 1.0 MBR
+>0x145 search/7 Default:\ F \b, FREE-DOS MBR
+#>>313 string F0\ .\ .\ .
+#>>>322 string disk\ 1
+#>>>>382 string FAT3
>64 string no\ active\ partition\ found
>>96 string read\ error\ while\ reading\ drive \b, FREE-DOS Beta 0.9 MBR
+# Ranish Partition Manager http://www.ranish.com/part/
+>387 search/4 \0\ Error!\r
+>>378 search/7 Virus!
+>>>397 search/4 Booting\
+>>>>408 search/4 HD1/\0 \b, Ranish MBR (
+>>>>>416 string Writing\ changes... \b2.37
+>>>>>>438 ubyte x \b,0x%x dots
+>>>>>>440 ubyte >0 \b,virus check
+>>>>>>441 ubyte >0 \b,partition %c
+#2.38,2.42,2.44
+>>>>>416 string !Writing\ changes... \b
+>>>>>>418 ubyte 1 \bvirus check,
+>>>>>>419 ubyte x \b0x%x seconds
+>>>>>>420 ubyte&0x0F >0 \b,partition
+>>>>>>>420 ubyte&0x0F <5 \b %x
+>>>>>>>420 ubyte&0x0F 0Xf \b ask
+>>>>>420 ubyte x \b)
+#
>271 string Operating\ system\ loading
>>296 string error\r \b, SYSLINUX MBR (2.10)
# http://www.acronis.de/
@@ -124,18 +147,20 @@
>0x40 string SBML
# label with 11 characters of FAT 12 bit filesystem
>>43 string SMART\ BTMGR
->>>430 string SBMK\ Bad!\r
->>>>3 string SBM \b, Smart Boot Manager
->>>>>6 string >\0 \b, version %s
+>>>430 string SBMK\ Bad!\r \b, Smart Boot Manager
+# OEM-ID not always "SBM"
+#>>>>3 strings SBM
+>>>>6 string >\0 \b, version %s
>382 string XOSLLOADXCF \b, eXtended Operating System Loader
>6 string LILO \b, LInux i386 boot LOader
>>120 string LILO \b, version 22.3.4 SuSe
>>172 string LILO \b, version 22.5.8 Debian
-# updated by Joerg Jenderek
+# updated by Joerg Jenderek at Oct 2008
# variables according to grub-0.97/stage1/stage1.S or
# http://www.gnu.org/software/grub/manual/grub.html#Embedded-data
# usual values are marked with comments to get only informations of strange GRUB loaders
->0 ulelong 0x009048EB
+>342 search/60 \0Geom\0
+#>0 ulelong x %x=0x009048EB , 0x2a9048EB 0
>>0x41 ubyte <2
>>>0x3E ubyte >2 \b; GRand Unified Bootloader
# 0x3 for 0.5.95,0.93,0.94,0.96 0x4 for 1.90
@@ -178,15 +203,14 @@
>3 string BCDL
>>498 string BCDL\ \ \ \ BIN \b, Bootable CD Loader (1.50Z)
# mbr partion table entries
-# OEM-ID not Microsoft,SYSLINUX,or MTOOLs
+# OEM-ID does not contain MicroSoft,NEWLDR,DOS,SYSLINUX,or MTOOLs
>3 string !MS
>>3 string !SYSLINUX
>>>3 string !MTOOL
+>>>>3 string !NEWLDR
+>>>>>5 string !DOS
# not FAT (32 bit)
->>>>82 string !FAT32
-#not IO.SYS
->>>>>472 string !IO\ \ \ \ \ \ SYS
->>>>>>480 string !IO\ \ \ \ \ \ SYS
+>>>>>>82 string !FAT32
#not Linux kernel
>>>>>>>514 string !HdrS
#not BeOS
@@ -272,6 +296,11 @@
>>>>>>>>>(1.b+11) ubyte 0xb
>>>>>>>>>>(1.b+12) ubyte 0x56
>>>>>>>>>>(1.b+13) ubyte 0xb4 \b, mkdosfs boot message display
+>214 string Please\ try\ to\ install\ FreeDOS\ \b, DOS Emulator boot message display
+#>>244 string from\ dosemu-freedos-*-bin.tgz\r
+#>>>170 string Sorry,\ could\ not\ load\ an\
+#>>>>195 string operating\ system.\r\n
+#
>103 string This\ is\ not\ a\ bootable\ disk.\
>>132 string Please\ insert\ a\ bootable\
>>>157 string floppy\ and\r\n
@@ -374,12 +403,22 @@
>430 string Datentr\204ger\ entfernen\xFF\r\n
>>454 string Medienfehler\xFF\r\n
>>>469 string Neustart:\ Taste\ dr\201cken\r \b, Microsoft Windows XP Bootloader (4.german)
->>>>368 ubyte&0xDF >0
->>>>>368 string x %-.5s
->>>>>>373 ubyte&0xDF >0
->>>>>>>373 string x \b%-.3s
->>>>>376 ubyte&0xDF >0
->>>>>>376 string x \b.%-.3s
+>>>>379 string \0
+>>>>>368 ubyte&0xDF >0
+>>>>>>368 string x %-.5s
+>>>>>>>373 ubyte&0xDF >0
+>>>>>>>>373 string x \b%-.3s
+>>>>>>376 ubyte&0xDF >0
+>>>>>>>376 string x \b.%-.3s
+# variant
+>>>>417 ubyte&0xDF >0
+>>>>>417 string x %-.5s
+>>>>>>422 ubyte&0xDF >0
+>>>>>>>422 string x \b%-.3s
+>>>>>425 ubyte&0xDF >0
+>>>>>>425 string >\ \b.%-.3s
+#
+
#>3 string NTFS\ \ \ \
>389 string Fehler\ beim\ Lesen\
>>407 string des\ Datentr\204gers
@@ -567,12 +606,27 @@
>>>489 string Any\ key\ to\ retry \b, DR-DOS Bootloader
>>471 string Cannot\ load\ DOS\
>>487 string press\ key\ to\ retry \b, Open-DOS Bootloader
+#??
>444 string KERNEL\ \ SYS
>>314 string BOOT\ error! \b, FREE-DOS Bootloader
>499 string KERNEL\ \ SYS
>>305 string BOOT\ err!\0 \b, Free-DOS Bootloader
>449 string KERNEL\ \ SYS
>>319 string BOOT\ error! \b, FREE-DOS 0.5 Bootloader
+#
+>449 string Loading\ FreeDOS
+>>0x1AF ulelong >0 \b, FREE-DOS 0.95,1.0 Bootloader
+>>>497 ubyte&0xDF >0
+>>>>497 string x \b %-.6s
+>>>>>503 ubyte&0xDF >0
+>>>>>>503 string x \b%-.1s
+>>>>>>>504 ubyte&0xDF >0
+>>>>>>>>504 string x \b%-.1s
+>>>>505 ubyte&0xDF >0
+>>>>>505 string x \b.%-.3s
+#
+>331 string Error!.0 \b, FREE-DOS 1.0 bootloader
+#
>125 string Loading\ FreeDOS...\r
>>311 string BOOT\ error!\r \b, FREE-DOS bootloader
>>>441 ubyte&0xDF >0
@@ -706,13 +760,7 @@
#it also hangs with another message ("NF").
>>>>>492 string RENF \b, FAT (12 bit)
>>>>>495 string RENF \b, FAT (16 bit)
-# added by Joerg Jenderek
-# http://syslinux.zytor.com/iso.php
-0 ulelong 0x7c40eafa isolinux Loader
-# http://syslinux.zytor.com/pxe.php
-0 ulelong 0x007c05ea pxelinux Loader
-0 ulelong 0x60669c66 pxelinux Loader
-# loader end
+# x86 bootloader end
# updated by Joerg Jenderek at Sep 2007
>3 ubyte 0
#no active flag
@@ -732,6 +780,7 @@
# older drives may use Near JuMP instruction E9 xx xx
>0 lelong&0x009000EB 0x009000EB
>0 lelong&0x000000E9 0x000000E9
+# minimal short forward jump found 03cx??
# maximal short forward jump is 07fx
>1 ubyte <0xff \b, code offset 0x%x
# mtools-3.9.8/msdos.h
@@ -740,91 +789,92 @@
>>11 uleshort&0x000f x
>>>11 uleshort <32769
>>>>11 uleshort >31
->>>>>3 string >\0 \b, OEM-ID "%8.8s"
+>>>>>21 ubyte&0xf0 0xF0
+>>>>>>3 string >\0 \b, OEM-ID "%8.8s"
#http://mirror.href.com/thestarman/asm/debug/debug2.htm#IHC
->>>>>>8 string IHC \b cached by Windows 9M
->>>>>11 uleshort >512 \b, Bytes/sector %u
-#>>>>>11 uleshort =512 \b, Bytes/sector %u=512 (usual)
->>>>>11 uleshort <512 \b, Bytes/sector %u
->>>>>13 ubyte >1 \b, sectors/cluster %u
-#>>>>>13 ubyte =1 \b, sectors/cluster %u (usual on Floppies)
->>>>>14 uleshort >32 \b, reserved sectors %u
-#>>>>>14 uleshort =32 \b, reserved sectors %u (usual Fat32)
-#>>>>>14 uleshort >1 \b, reserved sectors %u
-#>>>>>14 uleshort =1 \b, reserved sectors %u (usual FAT12,FAT16)
->>>>>14 uleshort <1 \b, reserved sectors %u
->>>>>16 ubyte >2 \b, FATs %u
-#>>>>>16 ubyte =2 \b, FATs %u (usual)
->>>>>16 ubyte =1 \b, FAT %u
->>>>>16 ubyte >0
->>>>>17 uleshort >0 \b, root entries %u
-#>>>>>17 uleshort =0 \b, root entries %u=0 (usual Fat32)
->>>>>19 uleshort >0 \b, sectors %u (volumes <=32 MB)
-#>>>>>19 uleshort =0 \b, sectors %u=0 (usual Fat32)
->>>>>21 ubyte >0xF0 \b, Media descriptor 0x%x
-#>>>>>21 ubyte =0xF0 \b, Media descriptor 0x%x (usual floppy)
->>>>>21 ubyte <0xF0 \b, Media descriptor 0x%x
->>>>>22 uleshort >0 \b, sectors/FAT %u
-#>>>>>22 uleshort =0 \b, sectors/FAT %u=0 (usual Fat32)
->>>>>26 ubyte >2 \b, heads %u
-#>>>>>26 ubyte =2 \b, heads %u (usual floppy)
->>>>>26 ubyte =1 \b, heads %u
+>>>>>>>8 string IHC \b cached by Windows 9M
+>>>>>>11 uleshort >512 \b, Bytes/sector %u
+#>>>>>>11 uleshort =512 \b, Bytes/sector %u=512 (usual)
+>>>>>>11 uleshort <512 \b, Bytes/sector %u
+>>>>>>13 ubyte >1 \b, sectors/cluster %u
+#>>>>>>13 ubyte =1 \b, sectors/cluster %u (usual on Floppies)
+>>>>>>14 uleshort >32 \b, reserved sectors %u
+#>>>>>>14 uleshort =32 \b, reserved sectors %u (usual Fat32)
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
From owner-svn-src-projects@FreeBSD.ORG Thu May 7 03:39:25 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 3BA31106566B;
Thu, 7 May 2009 03:39:25 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 2A13B8FC14;
Thu, 7 May 2009 03:39:25 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n473dNuP039175;
Thu, 7 May 2009 03:39:23 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n473dNDx039173;
Thu, 7 May 2009 03:39:23 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <200905070339.n473dNDx039173@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Thu, 7 May 2009 03:39:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191872 - projects/mips/sys/mips/atheros
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 May 2009 03:39:25 -0000
Author: gonzo
Date: Thu May 7 03:39:23 2009
New Revision: 191872
URL: http://svn.freebsd.org/changeset/base/191872
Log:
- Add interrupt handling for AR71XX PCI bridge
Modified:
projects/mips/sys/mips/atheros/ar71xx_pci.c
projects/mips/sys/mips/atheros/ar71xxreg.h
Modified: projects/mips/sys/mips/atheros/ar71xx_pci.c
==============================================================================
--- projects/mips/sys/mips/atheros/ar71xx_pci.c Thu May 7 03:23:22 2009 (r191871)
+++ projects/mips/sys/mips/atheros/ar71xx_pci.c Thu May 7 03:39:23 2009 (r191872)
@@ -68,10 +68,34 @@ struct ar71xx_pci_softc {
struct rman sc_mem_rman;
struct rman sc_irq_rman;
+ struct intr_event *sc_eventstab[AR71XX_PCI_NIRQS];
struct resource *sc_irq;
void *sc_ih;
};
+static int ar71xx_pci_setup_intr(device_t, device_t, struct resource *, int,
+ driver_filter_t *, driver_intr_t *, void *, void **);
+static int ar71xx_pci_teardown_intr(device_t, device_t, struct resource *,
+ void *);
+static int ar71xx_pci_intr(void *);
+
+static void ar71xx_pci_mask_irq(unsigned int irq)
+{
+ uint32_t reg;
+
+ reg = ATH_READ_REG(AR71XX_PCI_INTR_MASK);
+ ATH_WRITE_REG(AR71XX_PCI_INTR_MASK, reg & ~(1 << irq));
+
+}
+
+static void ar71xx_pci_unmask_irq(unsigned int irq)
+{
+ uint32_t reg;
+
+ reg = ATH_READ_REG(AR71XX_PCI_INTR_MASK);
+ ATH_WRITE_REG(AR71XX_PCI_INTR_MASK, reg | (1 << irq));
+}
+
/*
* get bitmask for bytes of interest:
* 0 - we want this byte, 1 - ignore it. e.g: we read 1 byte
@@ -213,13 +237,6 @@ ar71xx_pci_write_config(device_t dev, in
}
static int
-at71xx_pci_intr(void *v)
-{
- panic("Implement me: %s\n", __func__);
- return FILTER_HANDLED;
-}
-
-static int
ar71xx_pci_probe(device_t dev)
{
@@ -261,7 +278,7 @@ ar71xx_pci_attach(device_t dev)
}
if ((bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_MISC,
- at71xx_pci_intr, NULL, sc, &sc->sc_ih))) {
+ ar71xx_pci_intr, NULL, sc, &sc->sc_ih))) {
device_printf(dev,
"WARNING: unable to register interrupt handler\n");
return ENXIO;
@@ -369,11 +386,85 @@ ar71xx_pci_alloc_resource(device_t bus,
}
static int
-ar71xx_pci_teardown_intr(device_t dev, device_t child, struct resource *res,
+ar71xx_pci_setup_intr(device_t bus, device_t child, struct resource *ires,
+ int flags, driver_filter_t *filt, driver_intr_t *handler,
+ void *arg, void **cookiep)
+{
+ struct ar71xx_pci_softc *sc = device_get_softc(bus);
+ struct intr_event *event;
+ int irq, error;
+
+ irq = rman_get_start(ires);
+
+ if (irq > AR71XX_PCI_IRQ_END)
+ panic("%s: bad irq %d", __func__, irq);
+
+ event = sc->sc_eventstab[irq];
+ if (event == NULL) {
+ error = intr_event_create(&event, (void *)irq, 0, irq,
+ (mask_fn)ar71xx_pci_mask_irq,
+ (mask_fn)ar71xx_pci_unmask_irq,
+ NULL, NULL,
+ "ar71xx_pci intr%d:", irq);
+
+ sc->sc_eventstab[irq] = event;
+ }
+
+ intr_event_add_handler(event, device_get_nameunit(child), filt,
+ handler, arg, intr_priority(flags), flags, cookiep);
+
+ ar71xx_pci_unmask_irq(irq);
+
+ return (0);
+}
+
+static int
+ar71xx_pci_teardown_intr(device_t dev, device_t child, struct resource *ires,
void *cookie)
{
+ struct ar71xx_pci_softc *sc = device_get_softc(dev);
+ int irq, result;
+
+ irq = rman_get_start(ires);
+ if (irq > AR71XX_PCI_IRQ_END)
+ panic("%s: bad irq %d", __func__, irq);
+
+ if (sc->sc_eventstab[irq] == NULL)
+ panic("Trying to teardown unoccupied IRQ");
+
+ ar71xx_pci_mask_irq(irq);
+
+ result = intr_event_remove_handler(cookie);
+ if (!result)
+ sc->sc_eventstab[irq] = NULL;
+
+ return (result);
+}
+
+static int
+ar71xx_pci_intr(void *arg)
+{
+ struct ar71xx_pci_softc *sc = arg;
+ struct intr_event *event;
+ uint32_t reg, irq;
+
+ reg = ATH_READ_REG(AR71XX_PCI_INTR_STATUS);
+ for (irq = AR71XX_PCI_IRQ_START; irq <= AR71XX_PCI_IRQ_END; irq++) {
+ if (reg & (1 << irq)) {
+ event = sc->sc_eventstab[irq];
+ if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ /* Ignore timer interrupts */
+ if (irq != 0)
+ printf("Stray IRQ %d\n", irq);
+ continue;
+ }
+
+ /* TODO: frame instead of NULL? */
+ intr_event_handle(event, NULL);
+ }
+ }
- return (intr_event_remove_handler(cookie));
+ return (FILTER_HANDLED);
}
static int
@@ -406,7 +497,7 @@ static device_method_t ar71xx_pci_method
DEVMETHOD(bus_release_resource, bus_generic_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
- DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
+ DEVMETHOD(bus_setup_intr, ar71xx_pci_setup_intr),
DEVMETHOD(bus_teardown_intr, ar71xx_pci_teardown_intr),
/* pcib interface */
Modified: projects/mips/sys/mips/atheros/ar71xxreg.h
==============================================================================
--- projects/mips/sys/mips/atheros/ar71xxreg.h Thu May 7 03:23:22 2009 (r191871)
+++ projects/mips/sys/mips/atheros/ar71xxreg.h Thu May 7 03:39:23 2009 (r191872)
@@ -41,6 +41,7 @@
#define AR71XX_PCI_MEM_SIZE 0x07000000
#define AR71XX_PCI_IRQ_START 0
#define AR71XX_PCI_IRQ_END 2
+#define AR71XX_PCI_NIRQS 3
/* PCI config registers */
#define AR71XX_PCI_LCONF_CMD 0x17010000
From owner-svn-src-projects@FreeBSD.ORG Thu May 7 11:47:52 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 4FA9B106564A;
Thu, 7 May 2009 11:47:52 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 3EF5A8FC12;
Thu, 7 May 2009 11:47:52 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n47Blqbj054621;
Thu, 7 May 2009 11:47:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n47BlqPs054619;
Thu, 7 May 2009 11:47:52 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905071147.n47BlqPs054619@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 7 May 2009 11:47:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191879 - projects/mesh11s/sys/dev/ath
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 May 2009 11:47:52 -0000
Author: rpaulo
Date: Thu May 7 11:47:51 2009
New Revision: 191879
URL: http://svn.freebsd.org/changeset/base/191879
Log:
Program the rx filter for mesh and add comments.
Sponsored by: The FreeBSD Foundation
Modified:
projects/mesh11s/sys/dev/ath/if_ath.c
Modified: projects/mesh11s/sys/dev/ath/if_ath.c
==============================================================================
--- projects/mesh11s/sys/dev/ath/if_ath.c Thu May 7 10:37:22 2009 (r191878)
+++ projects/mesh11s/sys/dev/ath/if_ath.c Thu May 7 11:47:51 2009 (r191879)
@@ -2314,7 +2314,7 @@ ath_key_update_end(struct ieee80211vap *
* NB: older hal's add rx filter bits out of sight and we need to
* blindly preserve them
* o probe request frames are accepted only when operating in
- * hostap, adhoc, or monitor modes
+ * hostap, adhoc, mesh, or monitor modes
* o enable promiscuous mode
* - when in monitor mode
* - if interface marked PROMISC (assumes bridge setting is filtered)
@@ -2327,6 +2327,7 @@ ath_key_update_end(struct ieee80211vap *
* - when doing s/w beacon miss (e.g. for ap+sta)
* - when operating in ap mode in 11g to detect overlapping bss that
* require protection
+ * - when operating in mesh mode to detect neighbors
* o accept control frames:
* - when in monitor mode
* XXX BAR frames for 11n
@@ -2358,6 +2359,8 @@ ath_calcrxfilter(struct ath_softc *sc)
if (ic->ic_opmode == IEEE80211_M_HOSTAP &&
IEEE80211_IS_CHAN_ANYG(ic->ic_curchan))
rfilt |= HAL_RX_FILTER_BEACON;
+ if (ic->ic_opmode == IEEE80211_M_MBSS)
+ rfilt |= HAL_RX_FILTER_BEACON;
if (ic->ic_opmode == IEEE80211_M_MONITOR)
rfilt |= HAL_RX_FILTER_CONTROL;
DPRINTF(sc, ATH_DEBUG_MODE, "%s: RX filter 0x%x, %s if_flags 0x%x\n",
From owner-svn-src-projects@FreeBSD.ORG Thu May 7 13:08:27 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 81F49106564A;
Thu, 7 May 2009 13:08:27 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 713C88FC0A;
Thu, 7 May 2009 13:08:27 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n47D8RXq056442;
Thu, 7 May 2009 13:08:27 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n47D8REY056441;
Thu, 7 May 2009 13:08:27 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905071308.n47D8REY056441@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 7 May 2009 13:08:27 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191881 - projects/mesh11s/sbin/ifconfig
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 May 2009 13:08:27 -0000
Author: rpaulo
Date: Thu May 7 13:08:26 2009
New Revision: 191881
URL: http://svn.freebsd.org/changeset/base/191881
Log:
Print mesh node information.
Sponsored by: The FreeBSD Foundation
Modified:
projects/mesh11s/sbin/ifconfig/ifieee80211.c
Modified: projects/mesh11s/sbin/ifconfig/ifieee80211.c
==============================================================================
--- projects/mesh11s/sbin/ifconfig/ifieee80211.c Thu May 7 12:55:58 2009 (r191880)
+++ projects/mesh11s/sbin/ifconfig/ifieee80211.c Thu May 7 13:08:26 2009 (r191881)
@@ -3187,6 +3187,20 @@ getrxseq(const struct ieee80211req_sta_i
#undef IEEE80211_NODE_QOS
}
+static const char *
+mesh_linkstate_string(uint8_t state)
+{
+ switch (state) {
+ case 0: return "IDLE";
+ case 1: return "OPEN SENT";
+ case 2: return "OPEN RECEIVED";
+ case 3: return "CONFIRM RECEIVED";
+ case 4: return "ESTABLISHED";
+ case 5: return "HOLDING";
+ default: return "UNKNOWN";
+ }
+}
+
static void
list_stations(int s)
{
@@ -3248,6 +3262,11 @@ list_stations(int s)
printies(cp + si->isi_ie_off, si->isi_ie_len, 24);
printmimo(&si->isi_mimo);
printf("\n");
+ if (verbose && opmode == IEEE80211_M_MBSS)
+ printf("\tMesh Peer ID: 0x%x, Local ID: 0x%x, "
+ "Link state: %s\n", si->isi_peerid,
+ si->isi_localid,
+ mesh_linkstate_string(si->isi_peerstate));
cp += si->isi_len, len -= si->isi_len;
} while (len >= sizeof(struct ieee80211req_sta_info));
}
From owner-svn-src-projects@FreeBSD.ORG Thu May 7 16:31:39 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 4439D1065675;
Thu, 7 May 2009 16:31:39 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 1A3DA8FC1F;
Thu, 7 May 2009 16:31:39 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n47GVc4H061363;
Thu, 7 May 2009 16:31:38 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n47GVcjK061362;
Thu, 7 May 2009 16:31:38 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200905071631.n47GVcjK061362@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Thu, 7 May 2009 16:31:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191888 - projects/ngroups
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 May 2009 16:31:39 -0000
Author: brooks
Date: Thu May 7 16:31:38 2009
New Revision: 191888
URL: http://svn.freebsd.org/changeset/base/191888
Log:
Create a complete copy of the source tree to work on increasing
NGROUPS_MAX.
Added:
projects/ngroups/ (props changed)
- copied from r191887, head/
From owner-svn-src-projects@FreeBSD.ORG Thu May 7 20:39:23 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 972B0106567B;
Thu, 7 May 2009 20:39:23 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id 84A068FC18;
Thu, 7 May 2009 20:39:23 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n47KdNfa067588;
Thu, 7 May 2009 20:39:23 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n47KdNgr067584;
Thu, 7 May 2009 20:39:23 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <200905072039.n47KdNgr067584@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Thu, 7 May 2009 20:39:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191901 - projects/mesh11s/sys/net80211
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 May 2009 20:39:24 -0000
Author: rpaulo
Date: Thu May 7 20:39:23 2009
New Revision: 191901
URL: http://svn.freebsd.org/changeset/base/191901
Log:
Checkpoint mesh peer link handling.
Sponsored by: The FreeBSD Foundation
Modified:
projects/mesh11s/sys/net80211/ieee80211_mesh.c
projects/mesh11s/sys/net80211/ieee80211_node.c
projects/mesh11s/sys/net80211/ieee80211_node.h
projects/mesh11s/sys/net80211/ieee80211_output.c
Modified: projects/mesh11s/sys/net80211/ieee80211_mesh.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_mesh.c Thu May 7 20:28:06 2009 (r191900)
+++ projects/mesh11s/sys/net80211/ieee80211_mesh.c Thu May 7 20:39:23 2009 (r191901)
@@ -69,6 +69,32 @@ static int mesh_input(struct ieee80211_n
static void mesh_recv_mgmt(struct ieee80211_node *, struct mbuf *, int,
int, int, uint32_t);
static void mesh_recv_action(struct ieee80211_node *, struct mbuf *);
+static void mesh_peer_timeout(void *);
+
+int ieee80211_mesh_retrytimeout = 40; /* 40 miliseconds */
+#define RETRY_TIMEOUT msecs_to_ticks(ieee80211_mesh_retrytimeout)
+int ieee80211_mesh_maxretries = 60;
+#define MESH_SET_TIMEOUT(xni) \
+do { \
+ xni->ni_mtimerboff = RETRY_TIMEOUT; \
+ callout_reset(&xni->ni_mtimer, RETRY_TIMEOUT, mesh_peer_timeout, xni); \
+} while (0)
+/*
+ * Same as above but backoffs timer statisically 50%.
+ * XXX: wrong arc4random usage.
+ */
+#define MESH_SET_TIMEOUT_BACKOFF(xni) \
+do { \
+ xni->ni_mtimerboff = xni->ni_mtimerboff + \
+ ((arc4random() & 0xff) % xni->ni_mtimerboff); \
+ callout_reset(&xni->ni_mtimer, RETRY_TIMEOUT, mesh_peer_timeout, xni); \
+} while (0)
+
+/* unalligned little endian access */
+#define LE_READ_2(p) \
+ ((uint16_t) \
+ ((((const uint8_t *)(p))[0] ) | \
+ (((const uint8_t *)(p))[1] << 8)))
void
ieee80211_mesh_attach(struct ieee80211com *ic)
@@ -383,31 +409,14 @@ mesh_recv_mgmt(struct ieee80211_node *ni
if ((scan.capinfo & (IEEE80211_CAPINFO_ESS|IEEE80211_CAPINFO_IBSS)) == 0 &&
!IEEE80211_ADDR_EQ(wh->i_addr2, ni->ni_macaddr) &&
IEEE80211_ADDR_EQ(wh->i_addr3, zerobssid)) {
+ uint16_t args[4];
/*
* Create a new entry in the neighbor table.
*/
ni = ieee80211_add_neighbor(vap, wh, &scan);
- } else {
/*
- * Record tsf for potential resync.
+ * Try to peer with this node.
*/
- memcpy(ni->ni_tstamp.data, scan.tstamp,
- sizeof(ni->ni_tstamp));
- }
- if (ni != NULL) {
- IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
- ni->ni_noise = noise;
- ni->ni_rstamp = rstamp;
- }
-
- /*
- * If it's a beacon for our mesh and we haven't already
- * peered with this node, send him a mgmt frame with
- * peer link IE.
- */
- if (ni->ni_peerstate == IEEE80211_NODE_MESH_IDLE) {
- uint16_t args[4];
-
get_random_bytes(&ni->ni_plid, 2);
ni->ni_peerstate = IEEE80211_NODE_MESH_OPENSNT;
IEEE80211_NOTE(vap,
@@ -418,8 +427,15 @@ mesh_recv_mgmt(struct ieee80211_node *ni
ieee80211_send_action(ni,
IEEE80211_ACTION_CAT_MESHPEERING,
IEEE80211_ACTION_MESHPEERING_OPEN, args);
- /* XXX setup timeout1 */
+ ni->ni_mrcount = 0;
+ MESH_SET_TIMEOUT(ni);
}
+ if (ni != NULL) {
+ IEEE80211_RSSI_LPF(ni->ni_avgrssi, rssi);
+ ni->ni_noise = noise;
+ ni->ni_rstamp = rstamp;
+ }
+
break;
}
case IEEE80211_FC0_SUBTYPE_PROBE_REQ:
@@ -441,13 +457,12 @@ mesh_recv_mgmt(struct ieee80211_node *ni
vap->iv_stats.is_rx_mgtdiscard++; /* XXX stat */
return;
}
-
/*
* prreq frame format
* [tlv] ssid
* [tlv] supported rates
* [tlv] extended supported rates
- * [tlv] Mesh ID
+ * [tlv] mesh id
*/
ssid = meshid = rates = xrates = NULL;
sfrm = frm;
@@ -522,6 +537,7 @@ mesh_recv_mgmt(struct ieee80211_node *ni
break;
}
}
+
static void
mesh_recv_action(struct ieee80211_node *ni, struct mbuf *m0)
{
@@ -540,7 +556,15 @@ mesh_recv_action(struct ieee80211_node *
frm += sizeof(ia);
efrm = mtod(m0, uint8_t *) + m0->m_len;
- /* XXX explain frame format */
+ /*
+ * We received an action for an unknown neighbor.
+ * XXX: wait for it to beacon or create ieee80211_node?
+ */
+ if (ni == vap->iv_bss) {
+ return;
+ }
+
+
meshid = NULL;
meshpeer = NULL;
meshconf = NULL;
@@ -555,6 +579,9 @@ mesh_recv_action(struct ieee80211_node *
break;
case IEEE80211_ELEMID_MESHPEER:
meshpeer = (struct ieee80211_meshpeer_ie *) frm;
+ meshpeer->peer_llinkid = LE_READ_2(&meshpeer->peer_llinkid);
+ meshpeer->peer_linkid = LE_READ_2(&meshpeer->peer_linkid);
+ meshpeer->peer_rcode = LE_READ_2(&meshpeer->peer_rcode);
break;
}
frm += frm[1] + 2;
@@ -570,15 +597,19 @@ mesh_recv_action(struct ieee80211_node *
vap->iv_stats.is_rx_mgtdiscard++;
return;
}
+
switch (ia->ia_category) {
+ /*
+ * Mesh Peer Link Management Finite State Machine handling.
+ */
case IEEE80211_ACTION_CAT_MESHPEERING:
switch (ia->ia_action) {
case IEEE80211_ACTION_MESHPEERING_OPEN:
IEEE80211_NOTE(vap,
IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
- "%s", "recv PEER OPEN");
+ "recv PEER OPEN, lid 0x%x", meshpeer->peer_llinkid);
switch (ni->ni_peerstate) {
- case IEEE80211_NODE_MESH_IDLE:
+ case IEEE80211_NODE_MESH_IDLE:
ni->ni_peerstate = IEEE80211_NODE_MESH_OPENRCV;
IEEE80211_NOTE(vap,
IEEE80211_MSG_MESH,
@@ -591,7 +622,7 @@ mesh_recv_action(struct ieee80211_node *
ieee80211_send_action(ni,
IEEE80211_ACTION_CAT_MESHPEERING,
IEEE80211_ACTION_MESHPEERING_OPEN, args);
- /* ... and confirm the link. */
+ /* ...and confirm the link. */
args[0] = ni->ni_plid;
args[1] = ni->ni_llid;
ieee80211_send_action(ni,
@@ -610,6 +641,7 @@ mesh_recv_action(struct ieee80211_node *
break;
case IEEE80211_NODE_MESH_OPENSNT:
ni->ni_peerstate = IEEE80211_NODE_MESH_OPENRCV;
+ ni->ni_llid = meshpeer->peer_llinkid;
IEEE80211_NOTE(vap,
IEEE80211_MSG_MESH,
ni, "peer link: switching to state %d",
@@ -635,12 +667,28 @@ mesh_recv_action(struct ieee80211_node *
IEEE80211_ACTION_MESHPEERING_CONFIRM, args);
/* clear timeoutC */
break;
+ case IEEE80211_NODE_MESH_ESTABLISHED:
+ args[0] = ni->ni_plid;
+ args[1] = ni->ni_llid;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_CONFIRM, args);
+ break;
+ case IEEE80211_NODE_MESH_HOLDING:
+ args[0] = ni->ni_llid;
+ args[1] = ni->ni_plid;
+ args[2] = IEEE80211_REASON_MESH_MAX_RETRIES;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_CLOSE, args);
+ break;
}
break;
case IEEE80211_ACTION_MESHPEERING_CONFIRM:
IEEE80211_NOTE(vap,
IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
- "%s", "recv PEER CONFIRM");
+ "recv PEER CONFIRM, local id 0x%x, peer id 0x%x",
+ meshpeer->peer_llinkid, meshpeer->peer_linkid);
switch (ni->ni_peerstate) {
case IEEE80211_NODE_MESH_OPENRCV:
ni->ni_peerstate = IEEE80211_NODE_MESH_ESTABLISHED;
@@ -648,7 +696,6 @@ mesh_recv_action(struct ieee80211_node *
IEEE80211_MSG_MESH,
ni, "peer link: switching to state %d",
ni->ni_peerstate);
- /* clear timeoutR */
break;
case IEEE80211_NODE_MESH_OPENSNT:
ni->ni_peerstate = IEEE80211_NODE_MESH_CONFIRMRECV;
@@ -657,14 +704,37 @@ mesh_recv_action(struct ieee80211_node *
ni, "peer link: switching to state %d",
ni->ni_peerstate);
break;
+ case IEEE80211_NODE_MESH_HOLDING:
+ args[0] = ni->ni_llid;
+ args[1] = ni->ni_plid;
+ args[2] = IEEE80211_REASON_MESH_MAX_RETRIES;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_CLOSE, args);
+ break;
default:
-
IEEE80211_DISCARD(vap,
IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH,
wh, NULL, "received confirm in invalid "
"state %d", ni->ni_peerstate);
vap->iv_stats.is_rx_mgtdiscard++;
}
+ break;
+ case IEEE80211_ACTION_MESHPEERING_CLOSE:
+ IEEE80211_NOTE(vap,
+ IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
+ "%s", "recv PEER CLOSE");
+ switch (ni->ni_peerstate) {
+ case IEEE80211_NODE_MESH_OPENRCV:
+ ni->ni_peerstate = IEEE80211_NODE_MESH_HOLDING;
+ MESH_SET_TIMEOUT(ni);
+ break;
+ case IEEE80211_NODE_MESH_OPENSNT:
+ break;
+ case IEEE80211_NODE_MESH_HOLDING:
+ break;
+ }
+ break;
}
break;
default:
@@ -675,6 +745,50 @@ mesh_recv_action(struct ieee80211_node *
}
/*
+ * Mesh Peer Link Management FSM timeout handling.
+ */
+static void
+mesh_peer_timeout(void *arg)
+{
+ struct ieee80211_node *ni = (struct ieee80211_node *)arg;
+ struct ieee80211vap *vap = ni->ni_vap;
+ uint16_t args[4];
+
+ IEEE80211_NOTE(vap,
+ IEEE80211_MSG_MESH,
+ ni, "mesh link timeout, state %d, retry counter %d",
+ ni->ni_peerstate, ni->ni_mrcount);
+
+ switch (ni->ni_peerstate) {
+ case IEEE80211_NODE_MESH_OPENSNT:
+ case IEEE80211_NODE_MESH_OPENRCV:
+ if (ni->ni_mrcount == ieee80211_mesh_maxretries) {
+ args[0] = ni->ni_plid;
+ args[2] = IEEE80211_REASON_MESH_MAX_RETRIES;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_CLOSE, args);
+ ni->ni_mrcount = 0;
+ ni->ni_peerstate = IEEE80211_NODE_MESH_HOLDING;
+ MESH_SET_TIMEOUT(ni);
+ } else {
+ args[0] = ni->ni_plid;
+ ieee80211_send_action(ni,
+ IEEE80211_ACTION_CAT_MESHPEERING,
+ IEEE80211_ACTION_MESHPEERING_OPEN, args);
+ ni->ni_mrcount++;
+ MESH_SET_TIMEOUT_BACKOFF(ni);
+ }
+ break;
+ case IEEE80211_NODE_MESH_CONFIRMRECV:
+
+ break;
+ case IEEE80211_NODE_MESH_HOLDING:
+ break;
+ }
+}
+
+/*
* Parse a MESH ID ie on station join.
*/
void
Modified: projects/mesh11s/sys/net80211/ieee80211_node.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_node.c Thu May 7 20:28:06 2009 (r191900)
+++ projects/mesh11s/sys/net80211/ieee80211_node.c Thu May 7 20:39:23 2009 (r191901)
@@ -1384,6 +1384,8 @@ ieee80211_init_neighbor(struct ieee80211
const struct ieee80211_frame *wh,
const struct ieee80211_scanparams *sp)
{
+ struct ieee80211vap *vap = ni->ni_vap;
+
ni->ni_esslen = sp->ssid[1];
memcpy(ni->ni_essid, sp->ssid + 2, sp->ssid[1]);
IEEE80211_ADDR_COPY(ni->ni_bssid, wh->i_addr3);
@@ -1395,6 +1397,11 @@ ieee80211_init_neighbor(struct ieee80211
ni->ni_fhindex = sp->fhindex;
ni->ni_erp = sp->erp;
ni->ni_timoff = sp->timoff;
+ if (vap->iv_opmode == IEEE80211_M_MBSS) {
+ ni->ni_meshidlen = sp->meshid[1];
+ memcpy(ni->ni_meshid, sp->meshid + 2, sp->meshid[1]);
+ callout_init(&ni->ni_mtimer, CALLOUT_MPSAFE);
+ }
if (ieee80211_ies_init(&ni->ni_ies, sp->ies, sp->ies_len)) {
ieee80211_ies_expand(&ni->ni_ies);
Modified: projects/mesh11s/sys/net80211/ieee80211_node.h
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_node.h Thu May 7 20:28:06 2009 (r191900)
+++ projects/mesh11s/sys/net80211/ieee80211_node.h Thu May 7 20:39:23 2009 (r191901)
@@ -185,6 +185,9 @@ struct ieee80211_node {
int8_t ni_peerstate; /* Mesh Peering state */
uint16_t ni_llid; /* local link ID */
uint16_t ni_plid; /* peer link ID */
+ struct callout ni_mtimer; /* mesh timer */
+ uint8_t ni_mrcount; /* mesh retry counter */
+ uint8_t ni_mtimerboff; /* mesh timer backoff value */
/* 11n state */
uint16_t ni_htcap; /* HT capabilities */
Modified: projects/mesh11s/sys/net80211/ieee80211_output.c
==============================================================================
--- projects/mesh11s/sys/net80211/ieee80211_output.c Thu May 7 20:28:06 2009 (r191900)
+++ projects/mesh11s/sys/net80211/ieee80211_output.c Thu May 7 20:39:23 2009 (r191901)
@@ -663,6 +663,17 @@ ieee80211_send_action(struct ieee80211_n
case IEEE80211_ACTION_CAT_MESHPEERING:
rs = ieee80211_get_suprates(ic, ic->ic_curchan);
switch (action) {
+ /*
+ * mesh peer open action frame format:
+ * [1] action
+ * [1] category
+ * [2] capabilities
+ * [tlv] rates
+ * [tlv] xrates
+ * [tlv] mesh id
+ * [tlv] mesh conf
+ * [tlv] mesh peer link mgmt
+ */
case IEEE80211_ACTION_MESHPEERING_OPEN:
IEEE80211_NOTE(vap,
IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
@@ -675,6 +686,19 @@ ieee80211_send_action(struct ieee80211_n
frm = ieee80211_add_meshpeer(frm,
IEEE80211_MESH_PEER_LINK_OPEN, args[0], 0, 0);
break;
+ /*
+ * mesh peer confirm action frame format:
+ * [1] action
+ * [1] category
+ * [2] capabilities
+ * [2] status code
+ * [2] association id (0)
+ * [tlv] rates
+ * [tlv] xrates
+ * [tlv] mesh id
+ * [tlv] mesh conf
+ * [tlv] mesh peer link mgmt
+ */
case IEEE80211_ACTION_MESHPEERING_CONFIRM:
IEEE80211_NOTE(vap,
IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
@@ -691,6 +715,14 @@ ieee80211_send_action(struct ieee80211_n
IEEE80211_MESH_PEER_LINK_CONFIRM, args[0], args[1],
0);
break;
+ /*
+ * mesh peer close action frame format:
+ * [1] action
+ * [1] category
+ * [2] reason code
+ * [tlv] mesh id
+ * [tlv] mesh peer link mgmt
+ */
case IEEE80211_ACTION_MESHPEERING_CLOSE:
IEEE80211_NOTE(vap,
IEEE80211_MSG_ACTION | IEEE80211_MSG_MESH, ni,
From owner-svn-src-projects@FreeBSD.ORG Fri May 8 20:48:06 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CD28E106566B;
Fri, 8 May 2009 20:48:06 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id A26C38FC13;
Fri, 8 May 2009 20:48:06 +0000 (UTC)
(envelope-from brooks@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n48Km69p002056;
Fri, 8 May 2009 20:48:06 GMT (envelope-from brooks@svn.freebsd.org)
Received: (from brooks@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id n48Km6g0002055;
Fri, 8 May 2009 20:48:06 GMT (envelope-from brooks@svn.freebsd.org)
Message-Id: <200905082048.n48Km6g0002055@svn.freebsd.org>
From: Brooks Davis <brooks@FreeBSD.org>
Date: Fri, 8 May 2009 20:48:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r191922 - projects/ngroups/usr.bin/catman
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src " projects"
tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>,
<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 May 2009 20:48:07 -0000
Author: brooks
Date: Fri May 8 20:48:06 2009
New Revision: 191922
URL: http://svn.freebsd.org/changeset/base/191922
Log:
Remove a use of NGROUPS by replacing a couple hand rolled checks that
are equivalent to access() calls.
Modified:
projects/ngroups/usr.bin/catman/catman.c
Modified: projects/ngroups/usr.bin/catman/catman.c
==============================================================================
--- projects/ngroups/usr.bin/catman/catman.c Fri May 8 20:16:04 2009 (r191921)
+++ projects/ngroups/usr.bin/catman/catman.c Fri May 8 20:48:06 2009 (r191922)
@@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$");
#define TEST_FILE 0x04
#define TEST_READABLE 0x08
#define TEST_WRITABLE 0x10
-#define TEST_EXECUTABLE 0x20
static int verbose; /* -v flag: be verbose with warnings */
static int pretend; /* -n, -p flags: print out what would be done
@@ -92,9 +91,6 @@ static const char *locale_device[] = {
#define GZCAT_CMD "z"
enum Ziptype {NONE, BZIP, GZIP};
-static uid_t uid;
-static gid_t gids[NGROUPS_MAX];
-static int ngids;
static int starting_dir;
static char tmp_file[MAXPATHLEN];
struct stat test_st;
@@ -320,23 +316,10 @@ test_path(char *name, time_t *mod_time)
result |= TEST_DIR;
else if (S_ISREG(test_st.st_mode))
result |= TEST_FILE;
- if (test_st.st_uid == uid) {
- test_st.st_mode >>= 6;
- } else {
- int i;
- for (i = 0; i < ngids; i++) {
- if (test_st.st_gid == gids[i]) {
- test_st.st_mode >>= 3;
- break;
- }
- }
- }
- if (test_st.st_mode & S_IROTH)
+ if (access(name, R_OK))
result |= TEST_READABLE;
- if (test_st.st_mode & S_IWOTH)
+ if (access(name, W_OK))
result |= TEST_WRITABLE;
- if (test_st.st_mode & S_IXOTH)
- result |= TEST_EXECUTABLE;
return result;
}
@@ -759,14 +742,6 @@ main(int argc, char **argv)
{
int opt;
- if ((uid = getuid()) == 0) {
- fprintf(stderr, "don't run %s as root, use:\n echo", argv[0]);
- for (optind = 0; optind < argc; optind++) {
- fprintf(stderr, " %s", argv[optind]);
- }
- fprintf(stderr, " | nice -5 su -m man\n");
- exit(1);
- }
while ((opt = getopt(argc, argv, "vnfLrh")) != -1) {
switch (opt) {
case 'f':
@@ -789,7 +764,6 @@ main(int argc, char **argv)
/* NOTREACHED */
}
}
- ngids = getgroups(NGROUPS_MAX, gids);
if ((starting_dir = open(".", 0)) < 0) {
err(1, ".");
}