svn commit: r240190 - head/sys/sparc64/include
Author: gavin Date: Fri Sep 7 08:18:06 2012 New Revision: 240190 URL: http://svn.freebsd.org/changeset/base/240190 Log: Prevent indent(1) from reformatting this comment, as it contains a formatting-sensitive table. Modified: head/sys/sparc64/include/vmparam.h Modified: head/sys/sparc64/include/vmparam.h == --- head/sys/sparc64/include/vmparam.h Fri Sep 7 07:28:10 2012 (r240189) +++ head/sys/sparc64/include/vmparam.h Fri Sep 7 08:18:06 2012 (r240190) @@ -126,7 +126,7 @@ #defineVM_LEVEL_0_ORDER9 #endif -/* +/** * Address space layout. * * UltraSPARC I and II implement a 44 bit virtual address space. The address ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240191 - head/contrib/bsnmp/snmpd
Author: kevlo Date: Fri Sep 7 08:58:30 2012 New Revision: 240191 URL: http://svn.freebsd.org/changeset/base/240191 Log: Fully initialize the stack-allocated "struct sockaddr_in sa" structure. Modified: head/contrib/bsnmp/snmpd/trap.c Modified: head/contrib/bsnmp/snmpd/trap.c == --- head/contrib/bsnmp/snmpd/trap.c Fri Sep 7 08:18:06 2012 (r240190) +++ head/contrib/bsnmp/snmpd/trap.c Fri Sep 7 08:58:30 2012 (r240191) @@ -117,7 +117,7 @@ trapsink_create(struct trapsink_dep *tde return (SNMP_ERR_RES_UNAVAIL); } (void)shutdown(t->socket, SHUT_RD); - + memset(&sa, 0, sizeof(sa)); sa.sin_len = sizeof(sa); sa.sin_family = AF_INET; sa.sin_addr.s_addr = htonl((t->index.subs[0] << 24) | @@ -725,6 +725,7 @@ target_activate_address(struct target_ad } (void)shutdown(addrs->socket, SHUT_RD); + memset(&sa, 0, sizeof(sa)); sa.sin_len = sizeof(sa); sa.sin_family = AF_INET; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240192 - head/bin/cat
Author: kevlo Date: Fri Sep 7 09:00:25 2012 New Revision: 240192 URL: http://svn.freebsd.org/changeset/base/240192 Log: Use "e.g.", not "i.e.", to introduce an example. Obtained from:NetBSD Modified: head/bin/cat/cat.1 Modified: head/bin/cat/cat.1 == --- head/bin/cat/cat.1 Fri Sep 7 08:58:30 2012(r240191) +++ head/bin/cat/cat.1 Fri Sep 7 09:00:25 2012(r240192) @@ -127,7 +127,7 @@ to the file truncating .Pa file3 if it already exists. -See the manual page for your shell (i.e., +See the manual page for your shell (e.g., .Xr sh 1 ) for more information on redirection. .Pp ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240193 - releng/9.1/sys/netinet6
Author: bz
Date: Fri Sep 7 09:22:11 2012
New Revision: 240193
URL: http://svn.freebsd.org/changeset/base/240193
Log:
MFC r238877-238878:
Fix a comment that we do not have an SA yet but need to acquire one.
For consistency put the IPsec comment iside the #fidef section.
MFC r238934
Improve the should-never-hit printf to ease debugging in case we'd ever hit
it again when doing the delayed IPv6 checksum calculations.
Approved by: re (kib)
Modified:
releng/9.1/sys/netinet6/ip6_ipsec.c
releng/9.1/sys/netinet6/ip6_output.c
Directory Properties:
releng/9.1/sys/ (props changed)
Modified: releng/9.1/sys/netinet6/ip6_ipsec.c
==
--- releng/9.1/sys/netinet6/ip6_ipsec.c Fri Sep 7 09:00:25 2012
(r240192)
+++ releng/9.1/sys/netinet6/ip6_ipsec.c Fri Sep 7 09:22:11 2012
(r240193)
@@ -263,7 +263,7 @@ ip6_ipsec_output(struct mbuf **m, struct
mtag->m_tag_id !=
PACKET_TAG_IPSEC_OUT_CRYPTO_NEEDED)
continue;
/*
-* Check if policy has an SA associated with it.
+* Check if policy has no SA associated with it.
* This can happen when an SP has yet to acquire
* an SA; e.g. on first reference. If it occurs,
* then we let ipsec4_process_packet do its thing.
Modified: releng/9.1/sys/netinet6/ip6_output.c
==
--- releng/9.1/sys/netinet6/ip6_output.cFri Sep 7 09:00:25 2012
(r240192)
+++ releng/9.1/sys/netinet6/ip6_output.cFri Sep 7 09:22:11 2012
(r240193)
@@ -195,8 +195,9 @@ in6_delayed_cksum(struct mbuf *m, uint32
offset += m->m_pkthdr.csum_data;/* checksum offset */
if (offset + sizeof(u_short) > m->m_len) {
- printf("%s: delayed m_pullup, m->len: %d off: %d\n",
- __func__, m->m_len, offset);
+ printf("%s: delayed m_pullup, m->len: %d plen %u off %u "
+ "csum_flags=0x%04x\n", __func__, m->m_len, plen, offset,
+ m->m_pkthdr.csum_flags);
/*
* XXX this should not happen, but if it does, the correct
* behavior may be to insert the checksum in the appropriate
@@ -292,11 +293,11 @@ ip6_output(struct mbuf *m0, struct ip6_p
MAKE_EXTHDR(opt->ip6po_dest2, &exthdrs.ip6e_dest2);
}
+#ifdef IPSEC
/*
* IPSec checking which handles several cases.
* FAST IPSEC: We re-injected the packet.
*/
-#ifdef IPSEC
switch(ip6_ipsec_output(&m, inp, &flags, &error, &ifp, &sp))
{
case 1: /* Bad packet */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240194 - releng/9.1/sys/netinet6
Author: bz
Date: Fri Sep 7 09:45:08 2012
New Revision: 240194
URL: http://svn.freebsd.org/changeset/base/240194
Log:
MFC r238935,238960:
Properly apply #ifdef INET and leave a comment that we are (will) apply
delayed IPv6 checksum processing in ip6_output.c when doing IPsec.
In case of IPsec he have to do delayed checksum calculations before
adding any extension header, or rather before calling into IPsec
processing as we may send the packet and not return to IPv6 output
processing here.
PR: kern/170116
Approved by: re (kib)
Modified:
releng/9.1/sys/netinet6/ip6_ipsec.c
releng/9.1/sys/netinet6/ip6_output.c
Directory Properties:
releng/9.1/sys/ (props changed)
Modified: releng/9.1/sys/netinet6/ip6_ipsec.c
==
--- releng/9.1/sys/netinet6/ip6_ipsec.c Fri Sep 7 09:22:11 2012
(r240193)
+++ releng/9.1/sys/netinet6/ip6_ipsec.c Fri Sep 7 09:45:08 2012
(r240194)
@@ -291,16 +291,16 @@ ip6_ipsec_output(struct mbuf **m, struct
/*
* Do delayed checksums now because we send before
* this is done in the normal processing path.
-* XXX-BZ CSUM_DELAY_DATA_IPV6?
+* For IPv6 we do delayed checksums in ip6_output.c.
*/
+#ifdef INET
if ((*m)->m_pkthdr.csum_flags & CSUM_DELAY_DATA) {
ipseclog((LOG_DEBUG,
"%s: we do not support IPv4 over IPv6", __func__));
-#ifdef INET
in_delayed_cksum(*m);
-#endif
(*m)->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA;
}
+#endif
/*
* Preserve KAME behaviour: ENOENT can be returned
Modified: releng/9.1/sys/netinet6/ip6_output.c
==
--- releng/9.1/sys/netinet6/ip6_output.cFri Sep 7 09:22:11 2012
(r240193)
+++ releng/9.1/sys/netinet6/ip6_output.cFri Sep 7 09:45:08 2012
(r240194)
@@ -304,6 +304,20 @@ ip6_output(struct mbuf *m0, struct ip6_p
goto freehdrs;
case -1:/* Do IPSec */
needipsec = 1;
+ /*
+* Do delayed checksums now, as we may send before returning.
+*/
+ if (m->m_pkthdr.csum_flags & CSUM_DELAY_DATA_IPV6) {
+ plen = m->m_pkthdr.len - sizeof(*ip6);
+ in6_delayed_cksum(m, plen, sizeof(struct ip6_hdr));
+ m->m_pkthdr.csum_flags &= ~CSUM_DELAY_DATA_IPV6;
+ }
+#ifdef SCTP
+ if (m->m_pkthdr.csum_flags & CSUM_SCTP_IPV6) {
+ sctp_delayed_cksum(m, sizeof(struct ip6_hdr));
+ m->m_pkthdr.csum_flags &= ~CSUM_SCTP_IPV6;
+ }
+#endif
case 0: /* No IPSec */
default:
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240195 - stable/9/sys/fs/nfs
Author: kib
Date: Fri Sep 7 10:11:28 2012
New Revision: 240195
URL: http://svn.freebsd.org/changeset/base/240195
Log:
MFC r239039:
The header uma_int.h is internal uma header, unused by this source
file. Do not include it needlessly.
Modified:
stable/9/sys/fs/nfs/nfs_commonport.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/fs/ (props changed)
Modified: stable/9/sys/fs/nfs/nfs_commonport.c
==
--- stable/9/sys/fs/nfs/nfs_commonport.cFri Sep 7 09:45:08 2012
(r240194)
+++ stable/9/sys/fs/nfs/nfs_commonport.cFri Sep 7 10:11:28 2012
(r240195)
@@ -49,7 +49,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
extern int nfscl_ticks;
extern int nfsrv_nfsuserd;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240197 - stable/8/sys/fs/nfsclient
Author: rmacklem Date: Fri Sep 7 13:17:18 2012 New Revision: 240197 URL: http://svn.freebsd.org/changeset/base/240197 Log: MFC: r237200 Move the nfsrpc_close() call in ncl_reclaim() for the NFSv4 client to below the vnode_destroy_vobject() call, since that is where writes are flushed. Modified: stable/8/sys/fs/nfsclient/nfs_clnode.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/boot/ (props changed) stable/8/sys/cddl/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/compat/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/e1000/ (props changed) stable/8/sys/dev/sound/ (props changed) stable/8/sys/dev/sound/pci/ (props changed) stable/8/sys/dev/virtio/ (props changed) stable/8/sys/kern/ (props changed) stable/8/sys/sys/ (props changed) stable/8/sys/vm/ (props changed) Modified: stable/8/sys/fs/nfsclient/nfs_clnode.c == --- stable/8/sys/fs/nfsclient/nfs_clnode.c Fri Sep 7 11:11:56 2012 (r240196) +++ stable/8/sys/fs/nfsclient/nfs_clnode.c Fri Sep 7 13:17:18 2012 (r240197) @@ -254,15 +254,6 @@ ncl_reclaim(struct vop_reclaim_args *ap) struct nfsnode *np = VTONFS(vp); struct nfsdmap *dp, *dp2; - if (NFS_ISV4(vp) && vp->v_type == VREG) - /* -* Since mmap()'d files do I/O after VOP_CLOSE(), the NFSv4 -* Close operations are delayed until ncl_inactive(). -* However, since VOP_INACTIVE() is not guaranteed to be -* called, we need to do it again here. -*/ - (void) nfsrpc_close(vp, 1, ap->a_td); - /* * If the NLM is running, give it a chance to abort pending * locks. @@ -275,6 +266,15 @@ ncl_reclaim(struct vop_reclaim_args *ap) */ vnode_destroy_vobject(vp); + if (NFS_ISV4(vp) && vp->v_type == VREG) + /* +* We can now safely close any remaining NFSv4 Opens for +* this file. Most opens will have already been closed by +* ncl_inactive(), but there are cases where it is not +* called, so we need to do it again here. +*/ + (void) nfsrpc_close(vp, 1, ap->a_td); + vfs_hash_remove(vp); /* ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240198 - head/sys/netinet
Author: tuexen
Date: Fri Sep 7 13:36:42 2012
New Revision: 240198
URL: http://svn.freebsd.org/changeset/base/240198
Log:
Don't include a structure containing a flexible array in another
structure.
MFC after:10 days
Modified:
head/sys/netinet/sctp_header.h
head/sys/netinet/sctp_indata.c
head/sys/netinet/sctp_input.c
head/sys/netinet/sctp_input.h
head/sys/netinet/sctp_structs.h
Modified: head/sys/netinet/sctp_header.h
==
--- head/sys/netinet/sctp_header.h Fri Sep 7 13:17:18 2012
(r240197)
+++ head/sys/netinet/sctp_header.h Fri Sep 7 13:36:42 2012
(r240198)
@@ -510,16 +510,6 @@ struct sctp_stream_reset_add_strm {
* streams then the request will need to be an overlay structure.
*/
-struct sctp_stream_reset_out_req {
- struct sctp_chunkhdr ch;
- struct sctp_stream_reset_out_request sr_req;
-} SCTP_PACKED;
-
-struct sctp_stream_reset_in_req {
- struct sctp_chunkhdr ch;
- struct sctp_stream_reset_in_request sr_req;
-}SCTP_PACKED;
-
struct sctp_stream_reset_tsn_req {
struct sctp_chunkhdr ch;
struct sctp_stream_reset_tsn_request sr_req;
Modified: head/sys/netinet/sctp_indata.c
==
--- head/sys/netinet/sctp_indata.c Fri Sep 7 13:17:18 2012
(r240197)
+++ head/sys/netinet/sctp_indata.c Fri Sep 7 13:36:42 2012
(r240198)
@@ -2113,7 +2113,7 @@ finish_express_del:
*/
struct sctp_queued_to_read *ctl, *nctl;
- sctp_reset_in_stream(stcb, liste->number_entries,
liste->req.list_of_streams);
+ sctp_reset_in_stream(stcb, liste->number_entries,
liste->list_of_streams);
TAILQ_REMOVE(&asoc->resetHead, liste, next_resp);
SCTP_FREE(liste, SCTP_M_STRESET);
/* sa_ignore FREED_MEMORY */
Modified: head/sys/netinet/sctp_input.c
==
--- head/sys/netinet/sctp_input.c Fri Sep 7 13:17:18 2012
(r240197)
+++ head/sys/netinet/sctp_input.c Fri Sep 7 13:36:42 2012
(r240198)
@@ -3455,9 +3455,9 @@ process_chunk_drop(struct sctp_tcb *stcb
}
void
-sctp_reset_in_stream(struct sctp_tcb *stcb, int number_entries, uint16_t *
list)
+sctp_reset_in_stream(struct sctp_tcb *stcb, uint32_t number_entries, uint16_t
* list)
{
- int i;
+ uint32_t i;
uint16_t temp;
/*
@@ -3511,7 +3511,7 @@ struct sctp_stream_reset_out_request *
sctp_find_stream_reset(struct sctp_tcb *stcb, uint32_t seq, struct
sctp_tmit_chunk **bchk)
{
struct sctp_association *asoc;
- struct sctp_stream_reset_out_req *req;
+ struct sctp_chunkhdr *ch;
struct sctp_stream_reset_out_request *r;
struct sctp_tmit_chunk *chk;
int len, clen;
@@ -3534,8 +3534,8 @@ sctp_find_stream_reset(struct sctp_tcb *
*bchk = chk;
}
clen = chk->send_size;
- req = mtod(chk->data, struct sctp_stream_reset_out_req *);
- r = &req->sr_req;
+ ch = mtod(chk->data, struct sctp_chunkhdr *);
+ r = (struct sctp_stream_reset_out_request *)(ch + 1);
if (ntohl(r->request_seq) == seq) {
/* found it */
return (r);
@@ -3888,8 +3888,7 @@ sctp_handle_str_reset_request_out(struct
}
liste->tsn = tsn;
liste->number_entries = number_entries;
- memcpy(&liste->req, req,
- (sizeof(struct sctp_stream_reset_out_request) +
(number_entries * sizeof(uint16_t;
+ memcpy(&liste->list_of_streams, req->list_of_streams,
number_entries * sizeof(uint16_t));
TAILQ_INSERT_TAIL(&asoc->resetHead, liste, next_resp);
asoc->last_reset_action[0] =
SCTP_STREAM_RESET_RESULT_PERFORMED;
}
@@ -4059,7 +4058,7 @@ __attribute__((noinline))
#endif
static int
sctp_handle_stream_reset(struct sctp_tcb *stcb, struct mbuf *m, int
offset,
-struct sctp_stream_reset_out_req *sr_req)
+struct sctp_chunkhdr *ch_req)
{
int chk_length, param_len, ptype;
struct sctp_paramhdr pstore;
@@ -4074,7 +4073,7 @@ __attribute__((noinline))
int num_param = 0;
/* now it may be a reset or a reset-response */
- chk_length = ntohs(sr_req->ch.chunk_length);
+ chk_length = ntohs(ch_req->chunk_length);
/* setup for adding the response */
sctp_alloc_a_chunk(stcb, chk);
@@ -5413,7 +5412,7 @@ process_control_chunks:
*/
stcb->asoc.peer_supports_strreset = 1;
}
- if (sctp_handle
svn commit: r240199 - in stable/9/sys/dev: ahci ata ata/chipsets
Author: mav
Date: Fri Sep 7 14:04:00 2012
New Revision: 240199
URL: http://svn.freebsd.org/changeset/base/240199
Log:
MFC r239907:
Add IDs for JMicron JMB360/JMB362 AHCI SATA controllers.
Modified:
stable/9/sys/dev/ahci/ahci.c
stable/9/sys/dev/ata/ata-pci.h
stable/9/sys/dev/ata/chipsets/ata-jmicron.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/ahci/ahci.c
==
--- stable/9/sys/dev/ahci/ahci.cFri Sep 7 13:36:42 2012
(r240198)
+++ stable/9/sys/dev/ahci/ahci.cFri Sep 7 14:04:00 2012
(r240199)
@@ -181,7 +181,9 @@ static struct {
{0x1e0e8086, 0x00, "Intel Panther Point", 0},
{0x1e0f8086, 0x00, "Intel Panther Point", 0},
{0x23238086, 0x00, "Intel DH89xxCC",0},
+ {0x2360197b, 0x00, "JMicron JMB360",0},
{0x2361197b, 0x00, "JMicron JMB361",AHCI_Q_NOFORCE},
+ {0x2362197b, 0x00, "JMicron JMB362",0},
{0x2363197b, 0x00, "JMicron JMB363",AHCI_Q_NOFORCE},
{0x2365197b, 0x00, "JMicron JMB365",AHCI_Q_NOFORCE},
{0x2366197b, 0x00, "JMicron JMB366",AHCI_Q_NOFORCE},
Modified: stable/9/sys/dev/ata/ata-pci.h
==
--- stable/9/sys/dev/ata/ata-pci.h Fri Sep 7 13:36:42 2012
(r240198)
+++ stable/9/sys/dev/ata/ata-pci.h Fri Sep 7 14:04:00 2012
(r240199)
@@ -266,6 +266,7 @@ struct ata_pci_controller {
#define ATA_JMICRON_ID 0x197b
#define ATA_JMB360 0x2360197b
#define ATA_JMB361 0x2361197b
+#define ATA_JMB362 0x2362197b
#define ATA_JMB363 0x2363197b
#define ATA_JMB365 0x2365197b
#define ATA_JMB366 0x2366197b
Modified: stable/9/sys/dev/ata/chipsets/ata-jmicron.c
==
--- stable/9/sys/dev/ata/chipsets/ata-jmicron.c Fri Sep 7 13:36:42 2012
(r240198)
+++ stable/9/sys/dev/ata/chipsets/ata-jmicron.c Fri Sep 7 14:04:00 2012
(r240199)
@@ -67,6 +67,7 @@ ata_jmicron_probe(device_t dev)
static const struct ata_chip_id const ids[] =
{{ ATA_JMB360, 0, 1, 0, ATA_SA300, "JMB360" },
{ ATA_JMB361, 0, 1, 1, ATA_UDMA6, "JMB361" },
+ { ATA_JMB362, 0, 2, 0, ATA_SA300, "JMB362" },
{ ATA_JMB363, 0, 2, 1, ATA_UDMA6, "JMB363" },
{ ATA_JMB365, 0, 1, 2, ATA_UDMA6, "JMB365" },
{ ATA_JMB366, 0, 2, 2, ATA_UDMA6, "JMB366" },
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240200 - in stable/8/sys/dev: ahci ata ata/chipsets
Author: mav
Date: Fri Sep 7 14:05:08 2012
New Revision: 240200
URL: http://svn.freebsd.org/changeset/base/240200
Log:
MFC r239907:
Add IDs for JMicron JMB360/JMB362 AHCI SATA controllers.
Modified:
stable/8/sys/dev/ahci/ahci.c
stable/8/sys/dev/ata/ata-pci.h
stable/8/sys/dev/ata/chipsets/ata-jmicron.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
Modified: stable/8/sys/dev/ahci/ahci.c
==
--- stable/8/sys/dev/ahci/ahci.cFri Sep 7 14:04:00 2012
(r240199)
+++ stable/8/sys/dev/ahci/ahci.cFri Sep 7 14:05:08 2012
(r240200)
@@ -181,7 +181,9 @@ static struct {
{0x1e0e8086, 0x00, "Intel Panther Point", 0},
{0x1e0f8086, 0x00, "Intel Panther Point", 0},
{0x23238086, 0x00, "Intel DH89xxCC",0},
+ {0x2360197b, 0x00, "JMicron JMB360",0},
{0x2361197b, 0x00, "JMicron JMB361",AHCI_Q_NOFORCE},
+ {0x2362197b, 0x00, "JMicron JMB362",0},
{0x2363197b, 0x00, "JMicron JMB363",AHCI_Q_NOFORCE},
{0x2365197b, 0x00, "JMicron JMB365",AHCI_Q_NOFORCE},
{0x2366197b, 0x00, "JMicron JMB366",AHCI_Q_NOFORCE},
Modified: stable/8/sys/dev/ata/ata-pci.h
==
--- stable/8/sys/dev/ata/ata-pci.h Fri Sep 7 14:04:00 2012
(r240199)
+++ stable/8/sys/dev/ata/ata-pci.h Fri Sep 7 14:05:08 2012
(r240200)
@@ -266,6 +266,7 @@ struct ata_pci_controller {
#define ATA_JMICRON_ID 0x197b
#define ATA_JMB360 0x2360197b
#define ATA_JMB361 0x2361197b
+#define ATA_JMB362 0x2362197b
#define ATA_JMB363 0x2363197b
#define ATA_JMB365 0x2365197b
#define ATA_JMB366 0x2366197b
Modified: stable/8/sys/dev/ata/chipsets/ata-jmicron.c
==
--- stable/8/sys/dev/ata/chipsets/ata-jmicron.c Fri Sep 7 14:04:00 2012
(r240199)
+++ stable/8/sys/dev/ata/chipsets/ata-jmicron.c Fri Sep 7 14:05:08 2012
(r240200)
@@ -67,6 +67,7 @@ ata_jmicron_probe(device_t dev)
static const struct ata_chip_id const ids[] =
{{ ATA_JMB360, 0, 1, 0, ATA_SA300, "JMB360" },
{ ATA_JMB361, 0, 1, 1, ATA_UDMA6, "JMB361" },
+ { ATA_JMB362, 0, 2, 0, ATA_SA300, "JMB362" },
{ ATA_JMB363, 0, 2, 1, ATA_UDMA6, "JMB363" },
{ ATA_JMB365, 0, 1, 2, ATA_UDMA6, "JMB365" },
{ ATA_JMB366, 0, 2, 2, ATA_UDMA6, "JMB366" },
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240201 - stable/9/sys/dev/sound/pci/hda
Author: mav
Date: Fri Sep 7 14:07:13 2012
New Revision: 240201
URL: http://svn.freebsd.org/changeset/base/240201
Log:
MFC r239908:
Add bunch of ATI HDMI HDA controller IDs.
Modified:
stable/9/sys/dev/sound/pci/hda/hdac.c
stable/9/sys/dev/sound/pci/hda/hdac.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/sound/pci/hda/hdac.c
==
--- stable/9/sys/dev/sound/pci/hda/hdac.c Fri Sep 7 14:05:08 2012
(r240200)
+++ stable/9/sys/dev/sound/pci/hda/hdac.c Fri Sep 7 14:07:13 2012
(r240201)
@@ -138,6 +138,15 @@ static const struct {
{ HDA_ATI_RV730, "ATI RV730", 0, 0 },
{ HDA_ATI_RV740, "ATI RV740", 0, 0 },
{ HDA_ATI_RV770, "ATI RV770", 0, 0 },
+ { HDA_ATI_RV810, "ATI RV810", 0, 0 },
+ { HDA_ATI_RV830, "ATI RV830", 0, 0 },
+ { HDA_ATI_RV840, "ATI RV840", 0, 0 },
+ { HDA_ATI_RV870, "ATI RV870", 0, 0 },
+ { HDA_ATI_RV910, "ATI RV910", 0, 0 },
+ { HDA_ATI_RV930, "ATI RV930", 0, 0 },
+ { HDA_ATI_RV940, "ATI RV940", 0, 0 },
+ { HDA_ATI_RV970, "ATI RV970", 0, 0 },
+ { HDA_ATI_R1000, "ATI R1000", 0, 0 },
{ HDA_RDC_M3010, "RDC M3010", 0, 0 },
{ HDA_VIA_VT82XX,"VIA VT8251/8237A",0, 0 },
{ HDA_SIS_966, "SiS 966", 0, 0 },
Modified: stable/9/sys/dev/sound/pci/hda/hdac.h
==
--- stable/9/sys/dev/sound/pci/hda/hdac.h Fri Sep 7 14:05:08 2012
(r240200)
+++ stable/9/sys/dev/sound/pci/hda/hdac.h Fri Sep 7 14:07:13 2012
(r240201)
@@ -110,6 +110,15 @@
#define HDA_ATI_RV730 HDA_MODEL_CONSTRUCT(ATI, 0xaa38)
#define HDA_ATI_RV710 HDA_MODEL_CONSTRUCT(ATI, 0xaa40)
#define HDA_ATI_RV740 HDA_MODEL_CONSTRUCT(ATI, 0xaa48)
+#define HDA_ATI_RV870 HDA_MODEL_CONSTRUCT(ATI, 0xaa50)
+#define HDA_ATI_RV840 HDA_MODEL_CONSTRUCT(ATI, 0xaa58)
+#define HDA_ATI_RV830 HDA_MODEL_CONSTRUCT(ATI, 0xaa60)
+#define HDA_ATI_RV810 HDA_MODEL_CONSTRUCT(ATI, 0xaa68)
+#define HDA_ATI_RV970 HDA_MODEL_CONSTRUCT(ATI, 0xaa80)
+#define HDA_ATI_RV940 HDA_MODEL_CONSTRUCT(ATI, 0xaa88)
+#define HDA_ATI_RV930 HDA_MODEL_CONSTRUCT(ATI, 0xaa90)
+#define HDA_ATI_RV910 HDA_MODEL_CONSTRUCT(ATI, 0xaa98)
+#define HDA_ATI_R1000 HDA_MODEL_CONSTRUCT(ATI, 0xaaa0)
#define HDA_ATI_ALLHDA_MODEL_CONSTRUCT(ATI, 0x)
/* RDC */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240202 - stable/8/sys/dev/sound/pci/hda
Author: mav
Date: Fri Sep 7 14:10:22 2012
New Revision: 240202
URL: http://svn.freebsd.org/changeset/base/240202
Log:
MFC r239908:
Add bunch of ATI HDMI HDA controller IDs.
Modified:
stable/8/sys/dev/sound/pci/hda/hdac.c
stable/8/sys/dev/sound/pci/hda/hdac.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/sound/ (props changed)
stable/8/sys/dev/sound/pci/ (props changed)
Modified: stable/8/sys/dev/sound/pci/hda/hdac.c
==
--- stable/8/sys/dev/sound/pci/hda/hdac.c Fri Sep 7 14:07:13 2012
(r240201)
+++ stable/8/sys/dev/sound/pci/hda/hdac.c Fri Sep 7 14:10:22 2012
(r240202)
@@ -138,6 +138,15 @@ static const struct {
{ HDA_ATI_RV730, "ATI RV730", 0, 0 },
{ HDA_ATI_RV740, "ATI RV740", 0, 0 },
{ HDA_ATI_RV770, "ATI RV770", 0, 0 },
+ { HDA_ATI_RV810, "ATI RV810", 0, 0 },
+ { HDA_ATI_RV830, "ATI RV830", 0, 0 },
+ { HDA_ATI_RV840, "ATI RV840", 0, 0 },
+ { HDA_ATI_RV870, "ATI RV870", 0, 0 },
+ { HDA_ATI_RV910, "ATI RV910", 0, 0 },
+ { HDA_ATI_RV930, "ATI RV930", 0, 0 },
+ { HDA_ATI_RV940, "ATI RV940", 0, 0 },
+ { HDA_ATI_RV970, "ATI RV970", 0, 0 },
+ { HDA_ATI_R1000, "ATI R1000", 0, 0 },
{ HDA_RDC_M3010, "RDC M3010", 0, 0 },
{ HDA_VIA_VT82XX,"VIA VT8251/8237A",0, 0 },
{ HDA_SIS_966, "SiS 966", 0, 0 },
Modified: stable/8/sys/dev/sound/pci/hda/hdac.h
==
--- stable/8/sys/dev/sound/pci/hda/hdac.h Fri Sep 7 14:07:13 2012
(r240201)
+++ stable/8/sys/dev/sound/pci/hda/hdac.h Fri Sep 7 14:10:22 2012
(r240202)
@@ -110,6 +110,15 @@
#define HDA_ATI_RV730 HDA_MODEL_CONSTRUCT(ATI, 0xaa38)
#define HDA_ATI_RV710 HDA_MODEL_CONSTRUCT(ATI, 0xaa40)
#define HDA_ATI_RV740 HDA_MODEL_CONSTRUCT(ATI, 0xaa48)
+#define HDA_ATI_RV870 HDA_MODEL_CONSTRUCT(ATI, 0xaa50)
+#define HDA_ATI_RV840 HDA_MODEL_CONSTRUCT(ATI, 0xaa58)
+#define HDA_ATI_RV830 HDA_MODEL_CONSTRUCT(ATI, 0xaa60)
+#define HDA_ATI_RV810 HDA_MODEL_CONSTRUCT(ATI, 0xaa68)
+#define HDA_ATI_RV970 HDA_MODEL_CONSTRUCT(ATI, 0xaa80)
+#define HDA_ATI_RV940 HDA_MODEL_CONSTRUCT(ATI, 0xaa88)
+#define HDA_ATI_RV930 HDA_MODEL_CONSTRUCT(ATI, 0xaa90)
+#define HDA_ATI_RV910 HDA_MODEL_CONSTRUCT(ATI, 0xaa98)
+#define HDA_ATI_R1000 HDA_MODEL_CONSTRUCT(ATI, 0xaaa0)
#define HDA_ATI_ALLHDA_MODEL_CONSTRUCT(ATI, 0x)
/* RDC */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240203 - head/sys/dev/hwpmc
Author: fabient
Date: Fri Sep 7 14:45:59 2012
New Revision: 240203
URL: http://svn.freebsd.org/changeset/base/240203
Log:
Complete and merge the list between Sandy/Ivy bridge of events
that can run on specific PMC.
MFC after:1 month
Modified:
head/sys/dev/hwpmc/hwpmc_core.c
Modified: head/sys/dev/hwpmc/hwpmc_core.c
==
--- head/sys/dev/hwpmc/hwpmc_core.c Fri Sep 7 14:10:22 2012
(r240202)
+++ head/sys/dev/hwpmc/hwpmc_core.c Fri Sep 7 14:45:59 2012
(r240203)
@@ -1695,36 +1695,29 @@ iap_event_westmere_ok_on_counter(enum pm
}
static int
-iap_event_sandybridge_ok_on_counter(enum pmc_event pe, int ri)
-{
- uint32_t mask;
-
- switch (pe) {
- /*
-* Events valid only on counter 2.
-*/
- case PMC_EV_IAP_EVENT_48H_01H:
- mask = 0x4;
- break;
- default:
- mask = ~0; /* Any row index is ok. */
- }
-
- return (mask & (1 << ri));
-}
-
-static int
-iap_event_ivybridge_ok_on_counter(enum pmc_event pe, int ri)
+iap_event_sb_ib_ok_on_counter(enum pmc_event pe, int ri)
{
uint32_t mask;
switch (pe) {
- /*
-* Events valid only on counter 2.
-*/
+ /* Events valid only on counter 0. */
+ case PMC_EV_IAP_EVENT_B7H_01H:
+ mask = 0x1;
+ break;
+ /* Events valid only on counter 1. */
+ case PMC_EV_IAP_EVENT_C0H_01H:
+ mask = 0x1;
+ break;
+ /* Events valid only on counter 2. */
case PMC_EV_IAP_EVENT_48H_01H:
mask = 0x4;
break;
+ /* Events valid only on counter 3. */
+ case PMC_EV_IAP_EVENT_BBH_01H:
+ case PMC_EV_IAP_EVENT_CDH_01H:
+ case PMC_EV_IAP_EVENT_CDH_02H:
+ mask = 0x8;
+ break;
default:
mask = ~0; /* Any row index is ok. */
}
@@ -1808,12 +1801,9 @@ iap_allocate_pmc(int cpu, int ri, struct
if (iap_event_corei7_ok_on_counter(ev, ri) == 0)
return (EINVAL);
break;
- case PMC_CPU_INTEL_IVYBRIDGE:
- if (iap_event_ivybridge_ok_on_counter(ev, ri) == 0)
- return (EINVAL);
- break;
case PMC_CPU_INTEL_SANDYBRIDGE:
- if (iap_event_sandybridge_ok_on_counter(ev, ri) == 0)
+ case PMC_CPU_INTEL_IVYBRIDGE:
+ if (iap_event_sb_ib_ok_on_counter(ev, ri) == 0)
return (EINVAL);
break;
case PMC_CPU_INTEL_WESTMERE:
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240204 - head/sys/kern
Author: jhb
Date: Fri Sep 7 15:10:46 2012
New Revision: 240204
URL: http://svn.freebsd.org/changeset/base/240204
Log:
A few whitespace and comment fixes.
Modified:
head/sys/kern/kern_exit.c
head/sys/kern/kern_thread.c
Modified: head/sys/kern/kern_exit.c
==
--- head/sys/kern/kern_exit.c Fri Sep 7 14:45:59 2012(r240203)
+++ head/sys/kern/kern_exit.c Fri Sep 7 15:10:46 2012(r240204)
@@ -157,8 +157,8 @@ exit1(struct thread *td, int rv)
PROC_LOCK(p);
while (p->p_flag & P_HADTHREADS) {
/*
-* First check if some other thread got here before us..
-* if so, act apropriatly, (exit or suspend);
+* First check if some other thread got here before us.
+* If so, act appropriately: exit or suspend.
*/
thread_suspend_check(0);
@@ -179,7 +179,7 @@ exit1(struct thread *td, int rv)
* re-check all suspension request, the thread should
* either be suspended there or exit.
*/
- if (! thread_single(SINGLE_EXIT))
+ if (!thread_single(SINGLE_EXIT))
break;
/*
Modified: head/sys/kern/kern_thread.c
==
--- head/sys/kern/kern_thread.c Fri Sep 7 14:45:59 2012(r240203)
+++ head/sys/kern/kern_thread.c Fri Sep 7 15:10:46 2012(r240204)
@@ -718,7 +718,7 @@ stopme:
/*
* We have gotten rid of all the other threads and we
* are about to either exit or exec. In either case,
-* we try our utmost to revert to being a non-threaded
+* we try our utmost to revert to being a non-threaded
* process.
*/
p->p_singlethread = NULL;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240205 - head/share/man/man4
Author: zeising (ports committer) Date: Fri Sep 7 16:59:30 2012 New Revision: 240205 URL: http://svn.freebsd.org/changeset/base/240205 Log: Change the link pointing to more information about the Yarrow algorithm, the current link points to a irrelevant catchall site. PR: docs/171411 Submitted by: Mark Martinec (pr), me (patch) Approved by: joel (mentor) MFC after:2 weeks Modified: head/share/man/man4/random.4 Modified: head/share/man/man4/random.4 == --- head/share/man/man4/random.4Fri Sep 7 15:10:46 2012 (r240204) +++ head/share/man/man4/random.4Fri Sep 7 16:59:30 2012 (r240205) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 19, 2006 +.Dd September 7, 2012 .Dt RANDOM 4 .Os .Sh NAME @@ -142,7 +142,7 @@ if you wish to use them for entropy harv The other variables are explained in the paper describing the .Em Yarrow algorithm at -.Pa http://www.counterpane.com/yarrow.html . +.Pa http://www.schneier.com/yarrow.html . .Pp These variables are all limited in terms of the values they may contain: ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240206 - stable/9/sys/i386/bios
Author: dim
Date: Fri Sep 7 17:51:12 2012
New Revision: 240206
URL: http://svn.freebsd.org/changeset/base/240206
Log:
MFC r239869:
Remove the argument-less .align directive in sys/i386/bios/smapi_bios.S.
Specifying no argument is undocumented in the gas manual, and clang's
integrated assembler refuses to parse it. Also, removing it causes no
change at all in the resulting object file.
Modified:
stable/9/sys/i386/bios/smapi_bios.S
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/i386/bios/smapi_bios.S
==
--- stable/9/sys/i386/bios/smapi_bios.S Fri Sep 7 16:59:30 2012
(r240205)
+++ stable/9/sys/i386/bios/smapi_bios.S Fri Sep 7 17:51:12 2012
(r240206)
@@ -6,7 +6,6 @@ __FBSDID("$FreeBSD$");
* Thomas Hood.
*/
- .align
smapi32_entry: /* far pointer to SMAPI entry */
.globl smapi32_offset
smapi32_offset:.long 0x /* set by caller */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240207 - in stable/9/sys: conf gnu/fs/xfs gnu/fs/xfs/FreeBSD modules/xfs
Author: dim
Date: Fri Sep 7 17:58:36 2012
New Revision: 240207
URL: http://svn.freebsd.org/changeset/base/240207
Log:
MFC r239959:
Work around several warnings from clang in the xfs filesystem, when
linking it statically into the kernel. With our gcc in base there are
no warnings, so also remove the WERROR= from the module makefile.
Noted by: Eir Nym
MFC r240011:
Partially revert r239959, after actually fixing most of the clang
warnings in sys/gnu/fs/xfs. The only warnings that still need to be
suppressed are those about array bound overruns of flexible array
members in xfs_dir2_{block,sf}.c, which are too expensive (in terms of
cascading code changes) to fix.
Modified:
stable/9/sys/conf/files
stable/9/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
stable/9/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c
stable/9/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
stable/9/sys/gnu/fs/xfs/xfs_alloc.c
stable/9/sys/gnu/fs/xfs/xfs_vfsops.c
stable/9/sys/modules/xfs/Makefile
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/conf/files
==
--- stable/9/sys/conf/files Fri Sep 7 17:51:12 2012(r240206)
+++ stable/9/sys/conf/files Fri Sep 7 17:58:36 2012(r240207)
@@ -3407,7 +3407,7 @@ gnu/fs/xfs/xfs_dir.c optional xfs \
gnu/fs/xfs/xfs_dir2.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_block.coptional xfs \
- compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+ compile-with "${NORMAL_C} ${NO_WARRAY_BOUNDS} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_data.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_leaf.c optional xfs \
@@ -3415,7 +3415,7 @@ gnu/fs/xfs/xfs_dir2_leaf.coptional xfs
gnu/fs/xfs/xfs_dir2_node.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_sf.c optional xfs \
- compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+ compile-with "${NORMAL_C} ${NO_WARRAY_BOUNDS} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir2_trace.coptional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/xfs_dir_leaf.c optional xfs \
@@ -3505,7 +3505,7 @@ gnu/fs/xfs/FreeBSD/xfs_sysctl.c optional
gnu/fs/xfs/FreeBSD/xfs_fs_subr.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/FreeBSD/xfs_ioctl.c optional xfs \
- compile-with "${NORMAL_C} ${NO_WSELF_ASSIGN} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
+ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/FreeBSD/support/debug.c optional xfs \
compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD
-I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs"
gnu/fs/xfs/FreeBSD/support/ktrace.coptional xfs \
Modified: stable/9/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c
==
--- stable/9/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c Fri Sep 7 17:51:12 2012
(r240206)
+++ stable/9/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c Fri Sep 7 17:58:36 2012
(r240207)
@@ -1249,7 +1249,6 @@ xfs_ioc_xattr(
XFS_AT_NEXTENTS | XFS_AT_PROJID;
XVOP_GETATTR(vp, vattr, 0, NULL, error);
if (unlikely(error)) {
- error = error;
break;
}
@@ -1287,7 +1286,6 @@ xfs_ioc_xattr(
if (likely(!error))
__vn_revalidate(vp, vattr); /* update flags */
#endif
- error = error;
break;
}
@@ -1296,7 +1294,6 @@ xfs_ioc_xattr(
XFS_AT_ANEXTENTS | XFS_AT_PROJID;
XVOP_GETATTR(vp, vattr, 0, NULL, error);
if (unlikely(error)) {
- error = error;
break;
}
@@ -1347,7 +1344,6 @@ xfs_ioc_xattr(
if (likely(!error))
__vn_revalidate(vp, vattr); /* update flags */
#endif
- error = error;
break;
}
Modified: stable/9/sys/gnu/fs/xfs/FreeBSD/xfs_stats.c
=
svn commit: r240208 - in stable: 7/contrib/binutils/binutils 8/contrib/binutils/binutils 9/contrib/binutils/binutils
Author: dim Date: Fri Sep 7 18:03:29 2012 New Revision: 240208 URL: http://svn.freebsd.org/changeset/base/240208 Log: MFC r239962: Fix a twelve year old bug in readelf: when process_dynamic_segment() encounters a DT_RUNPATH entry, the global dynamic_info[] array is overrun, causing some other global variable to be overwritten. In my testcase, this was the section_headers variable, leading to segfaults or jemalloc assertions when it was freed later on. Thanks to Koop Mast for providing samples of a few "bad" .so files. Modified: stable/9/contrib/binutils/binutils/readelf.c Directory Properties: stable/9/contrib/binutils/ (props changed) Changes in other areas also in this revision: Modified: stable/7/contrib/binutils/binutils/readelf.c stable/8/contrib/binutils/binutils/readelf.c Directory Properties: stable/7/contrib/binutils/ (props changed) stable/8/contrib/binutils/ (props changed) Modified: stable/9/contrib/binutils/binutils/readelf.c == --- stable/9/contrib/binutils/binutils/readelf.cFri Sep 7 17:58:36 2012(r240207) +++ stable/9/contrib/binutils/binutils/readelf.cFri Sep 7 18:03:29 2012(r240208) @@ -174,7 +174,7 @@ static Elf_Internal_Syminfo *dynamic_sym static unsigned long dynamic_syminfo_offset; static unsigned int dynamic_syminfo_nent; static char program_interpreter[PATH_MAX]; -static bfd_vma dynamic_info[DT_JMPREL + 1]; +static bfd_vma dynamic_info[DT_ENCODING]; static bfd_vma dynamic_info_DT_GNU_HASH; static bfd_vma version_info[16]; static Elf_Internal_Ehdr elf_header; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240208 - in stable: 7/contrib/binutils/binutils 8/contrib/binutils/binutils 9/contrib/binutils/binutils
Author: dim Date: Fri Sep 7 18:03:29 2012 New Revision: 240208 URL: http://svn.freebsd.org/changeset/base/240208 Log: MFC r239962: Fix a twelve year old bug in readelf: when process_dynamic_segment() encounters a DT_RUNPATH entry, the global dynamic_info[] array is overrun, causing some other global variable to be overwritten. In my testcase, this was the section_headers variable, leading to segfaults or jemalloc assertions when it was freed later on. Thanks to Koop Mast for providing samples of a few "bad" .so files. Modified: stable/7/contrib/binutils/binutils/readelf.c Directory Properties: stable/7/contrib/binutils/ (props changed) Changes in other areas also in this revision: Modified: stable/8/contrib/binutils/binutils/readelf.c stable/9/contrib/binutils/binutils/readelf.c Directory Properties: stable/8/contrib/binutils/ (props changed) stable/9/contrib/binutils/ (props changed) Modified: stable/7/contrib/binutils/binutils/readelf.c == --- stable/7/contrib/binutils/binutils/readelf.cFri Sep 7 17:58:36 2012(r240207) +++ stable/7/contrib/binutils/binutils/readelf.cFri Sep 7 18:03:29 2012(r240208) @@ -128,7 +128,7 @@ Elf_Internal_Syminfo *dynamic_syminfo; unsigned long dynamic_syminfo_offset; unsigned int dynamic_syminfo_nent; char program_interpreter[64]; -bfd_vma dynamic_info[DT_JMPREL + 1]; +bfd_vma dynamic_info[DT_ENCODING]; bfd_vma version_info[16]; Elf_Internal_Ehdr elf_header; Elf_Internal_Shdr *section_headers; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240208 - in stable: 7/contrib/binutils/binutils 8/contrib/binutils/binutils 9/contrib/binutils/binutils
Author: dim Date: Fri Sep 7 18:03:29 2012 New Revision: 240208 URL: http://svn.freebsd.org/changeset/base/240208 Log: MFC r239962: Fix a twelve year old bug in readelf: when process_dynamic_segment() encounters a DT_RUNPATH entry, the global dynamic_info[] array is overrun, causing some other global variable to be overwritten. In my testcase, this was the section_headers variable, leading to segfaults or jemalloc assertions when it was freed later on. Thanks to Koop Mast for providing samples of a few "bad" .so files. Modified: stable/8/contrib/binutils/binutils/readelf.c Directory Properties: stable/8/contrib/binutils/ (props changed) Changes in other areas also in this revision: Modified: stable/7/contrib/binutils/binutils/readelf.c stable/9/contrib/binutils/binutils/readelf.c Directory Properties: stable/7/contrib/binutils/ (props changed) stable/9/contrib/binutils/ (props changed) Modified: stable/8/contrib/binutils/binutils/readelf.c == --- stable/8/contrib/binutils/binutils/readelf.cFri Sep 7 17:58:36 2012(r240207) +++ stable/8/contrib/binutils/binutils/readelf.cFri Sep 7 18:03:29 2012(r240208) @@ -128,7 +128,7 @@ Elf_Internal_Syminfo *dynamic_syminfo; unsigned long dynamic_syminfo_offset; unsigned int dynamic_syminfo_nent; char program_interpreter[64]; -bfd_vma dynamic_info[DT_JMPREL + 1]; +bfd_vma dynamic_info[DT_ENCODING]; bfd_vma version_info[16]; Elf_Internal_Ehdr elf_header; Elf_Internal_Shdr *section_headers; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240209 - head/sys/dev/twe
Author: jhb
Date: Fri Sep 7 18:41:19 2012
New Revision: 240209
URL: http://svn.freebsd.org/changeset/base/240209
Log:
Remove remaining 4.x compat shims. No resulting changes (verified by
md5).
Modified:
head/sys/dev/twe/twe.c
head/sys/dev/twe/twe_compat.h
head/sys/dev/twe/twe_freebsd.c
head/sys/dev/twe/twevar.h
Modified: head/sys/dev/twe/twe.c
==
--- head/sys/dev/twe/twe.c Fri Sep 7 18:03:29 2012(r240208)
+++ head/sys/dev/twe/twe.c Fri Sep 7 18:41:19 2012(r240209)
@@ -400,7 +400,7 @@ twe_startio(struct twe_softc *sc)
{
struct twe_request *tr;
TWE_Command*cmd;
-twe_bio*bp;
+struct bio *bp;
interror;
debug_called(4);
@@ -431,10 +431,10 @@ twe_startio(struct twe_softc *sc)
/* connect the bio to the command */
tr->tr_complete = twe_completeio;
tr->tr_private = bp;
- tr->tr_data = TWE_BIO_DATA(bp);
- tr->tr_length = TWE_BIO_LENGTH(bp);
+ tr->tr_data = bp->bio_data;
+ tr->tr_length = bp->bio_bcount;
cmd = TWE_FIND_COMMAND(tr);
- if (TWE_BIO_IS_READ(bp)) {
+ if (bp->bio_cmd == BIO_READ) {
tr->tr_flags |= TWE_CMD_DATAIN;
cmd->io.opcode = TWE_OP_READ;
} else {
@@ -444,9 +444,9 @@ twe_startio(struct twe_softc *sc)
/* build a suitable I/O command (assumes 512-byte rounded
transfers) */
cmd->io.size = 3;
- cmd->io.unit = TWE_BIO_UNIT(bp);
+ cmd->io.unit = *(int *)(bp->bio_driver1);
cmd->io.block_count = (tr->tr_length + TWE_BLOCK_SIZE - 1) /
TWE_BLOCK_SIZE;
- cmd->io.lba = TWE_BIO_LBA(bp);
+ cmd->io.lba = bp->bio_pblkno;
}
/* did we find something to do? */
@@ -461,8 +461,9 @@ twe_startio(struct twe_softc *sc)
break;
tr->tr_status = TWE_CMD_ERROR;
if (tr->tr_private != NULL) {
- bp = (twe_bio *)(tr->tr_private);
- TWE_BIO_SET_ERROR(bp, error);
+ bp = (struct bio *)(tr->tr_private);
+ bp->bio_error = error;
+ bp->bio_flags |= BIO_ERROR;
tr->tr_private = NULL;
twed_intr(bp);
twe_release_request(tr);
@@ -1012,15 +1013,17 @@ twe_completeio(struct twe_request *tr)
{
TWE_Command*cmd = TWE_FIND_COMMAND(tr);
struct twe_softc *sc = tr->tr_sc;
-twe_bio*bp = (twe_bio *)tr->tr_private;
+struct bio *bp = tr->tr_private;
debug_called(4);
if (tr->tr_status == TWE_CMD_COMPLETE) {
if (cmd->generic.status)
- if (twe_report_request(tr))
- TWE_BIO_SET_ERROR(bp, EIO);
+ if (twe_report_request(tr)) {
+ bp->bio_error = EIO;
+ bp->bio_flags |= BIO_ERROR;
+ }
} else {
twe_panic(sc, "twe_completeio on incomplete command");
Modified: head/sys/dev/twe/twe_compat.h
==
--- head/sys/dev/twe/twe_compat.h Fri Sep 7 18:03:29 2012
(r240208)
+++ head/sys/dev/twe/twe_compat.h Fri Sep 7 18:41:19 2012
(r240209)
@@ -49,6 +49,7 @@
#include
#include
+#include
#include
#include
#include
@@ -61,6 +62,8 @@
#include
#include
+#include
+
#define TWE_DRIVER_NAMEtwe
#define TWED_DRIVER_NAME twed
#define TWE_MALLOC_CLASS M_TWE
@@ -108,27 +111,6 @@
#define twe_printf(sc, fmt, args...) device_printf(sc->twe_dev, fmt , ##args)
#define twed_printf(twed, fmt, args...)device_printf(twed->twed_dev,
fmt , ##args)
-# include
-# include
-typedef struct bio twe_bio;
-typedef struct bio_queue_head twe_bioq;
-# define TWE_BIO_QINIT(bq) bioq_init(&bq);
-# define TWE_BIO_QINSERT(bq, bp) bioq_insert_tail(&bq, bp)
-# define TWE_BIO_QFIRST(bq)bioq_first(&bq)
-# define TWE_BIO_QREMOVE(bq, bp) bioq_remove(&bq, bp)
-# define TWE_BIO_IS_READ(bp) ((bp)->bio_cmd == BIO_READ)
-# define TWE_BIO_DATA(bp) (bp)->bio_data
-# define TWE_BIO_LENGTH(bp)(bp)->bio_bcount
-# define TWE_BIO_LBA(bp) (bp)->bio_pblkno
-# define TWE_BIO_SOFTC(bp) (bp)->bio_disk->d_drv1
-# define TWE_BIO_UNIT(bp) *(int *)(bp->bio_driver1)
-# define TWE_BIO_SET_ERROR(bp, err)do { (bp)->bio_error = err;
(bp)->bio_flags |= BIO_ERROR;} while(0)
-# define TWE_BIO_HAS_ERROR(bp) ((bp)->bio_flags & BIO_ERROR)
-# define TWE_BIO_RESID(bp) (bp)->bio_resid
-# define TWE_BIO_DONE(bp) biodone(bp)
-# define TWE_BIO_STATS_START(bp)
-# define TWE_BIO_STATS_END(bp)
-
#defineTWE_IO_LOCK(sc)
svn commit: r240210 - head/sys/dev/hptmv
Author: delphij
Date: Fri Sep 7 19:00:27 2012
New Revision: 240210
URL: http://svn.freebsd.org/changeset/base/240210
Log:
It seems that what the code really meant is that when a write is completed,
do a BUS_DMASYNC_POSTWRITE over the DMA map. The way it currently is would
only do POSTREAD for read transactions.
Submitted by: Sascha Wildner
MFC after:1 month
Modified:
head/sys/dev/hptmv/entry.c
Modified: head/sys/dev/hptmv/entry.c
==
--- head/sys/dev/hptmv/entry.c Fri Sep 7 18:41:19 2012(r240209)
+++ head/sys/dev/hptmv/entry.c Fri Sep 7 19:00:27 2012(r240210)
@@ -3046,7 +3046,7 @@ fOsCommandDone(_VBUS_ARG PCommand pCmd)
if (pCmd->cf_data_in) {
bus_dmamap_sync(pAdapter->io_dma_parent, pmap->dma_map,
BUS_DMASYNC_POSTREAD);
}
- else if (pCmd->cf_data_in) {
+ else if (pCmd->cf_data_out) {
bus_dmamap_sync(pAdapter->io_dma_parent, pmap->dma_map,
BUS_DMASYNC_POSTWRITE);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r240209 - head/sys/dev/twe
On Friday, September 07, 2012 2:41:19 pm John Baldwin wrote: > Author: jhb > Date: Fri Sep 7 18:41:19 2012 > New Revision: 240209 > URL: http://svn.freebsd.org/changeset/base/240209 > > Log: > Remove remaining 4.x compat shims. No resulting changes (verified by > md5). FYI, verifying by md5 did require some tweaking. First, I had to hack ensure LOCK_DEBUG was off in so that merely shuffling things around wouldn't introduce noise in __LINE__ args passed to mtx_*(). Second, I had to leave the typedefs for 'twe_bio' and 'twe_bioq' in even if they were unused. With those changes the md5 sums were the same. I removed the 'twe_bio' and 'twe_bioq' typedefs for the commit however. -- John Baldwin ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240211 - head/sys/dev/atkbdc
Author: jhb
Date: Fri Sep 7 19:42:36 2012
New Revision: 240211
URL: http://svn.freebsd.org/changeset/base/240211
Log:
Use callout(9) instead of timeout(9) to manage timers.
Modified:
head/sys/dev/atkbdc/psm.c
Modified: head/sys/dev/atkbdc/psm.c
==
--- head/sys/dev/atkbdc/psm.c Fri Sep 7 19:00:27 2012(r240210)
+++ head/sys/dev/atkbdc/psm.c Fri Sep 7 19:42:36 2012(r240211)
@@ -291,8 +291,8 @@ struct psm_softc { /* Driver status inf
struct timeval lastinputerr; /* time last sync error happened */
struct timeval taptimeout; /* tap timeout for touchpads */
int watchdog; /* watchdog timer flag */
- struct callout_handle callout; /* watchdog timer call out */
- struct callout_handle softcallout; /* buffer timer call out */
+ struct callout callout;/* watchdog timer call out */
+ struct callout softcallout; /* buffer timer call out */
struct cdev *dev;
struct cdev *bdev;
int lasterr;
@@ -960,7 +960,7 @@ doopen(struct psm_softc *sc, int command
/* start the watchdog timer */
sc->watchdog = FALSE;
- sc->callout = timeout(psmtimeout, (void *)(uintptr_t)sc, hz*2);
+ callout_reset(&sc->callout, hz * 2, psmtimeout, sc);
return (0);
}
@@ -979,8 +979,7 @@ reinitialize(struct psm_softc *sc, int d
/* block our watchdog timer */
sc->watchdog = FALSE;
- untimeout(psmtimeout, (void *)(uintptr_t)sc, sc->callout);
- callout_handle_init(&sc->callout);
+ callout_stop(&sc->callout);
/* save the current controller command byte */
empty_both_buffers(sc->kbdc, 10);
@@ -1418,7 +1417,8 @@ psmattach(device_t dev)
/* Setup initial state */
sc->state = PSM_VALID;
- callout_handle_init(&sc->callout);
+ callout_init(&sc->callout, 0);
+ callout_init(&sc->softcallout, 0);
/* Setup our interrupt handler */
rid = KBDC_RID_AUX;
@@ -1487,6 +1487,9 @@ psmdetach(device_t dev)
destroy_dev(sc->dev);
destroy_dev(sc->bdev);
+ callout_drain(&sc->callout);
+ callout_drain(&sc->softcallout);
+
return (0);
}
@@ -1615,8 +1618,7 @@ psmclose(struct cdev *dev, int flag, int
splx(s);
/* stop the watchdog timer */
- untimeout(psmtimeout, (void *)(uintptr_t)sc, sc->callout);
- callout_handle_init(&sc->callout);
+ callout_stop(&sc->callout);
/* remove anything left in the output buffer */
empty_aux_buffer(sc->kbdc, 10);
@@ -1839,7 +1841,7 @@ dropqueue(struct psm_softc *sc)
sc->queue.tail = 0;
if ((sc->state & PSM_SOFTARMED) != 0) {
sc->state &= ~PSM_SOFTARMED;
- untimeout(psmsoftintr, (void *)(uintptr_t)sc, sc->softcallout);
+ callout_stop(&sc->softcallout);
}
sc->pqueue_start = sc->pqueue_end;
}
@@ -2255,7 +2257,7 @@ psmtimeout(void *arg)
}
sc->watchdog = TRUE;
splx(s);
- sc->callout = timeout(psmtimeout, (void *)(uintptr_t)sc, hz);
+ callout_reset(&sc->callout, hz, psmtimeout, sc);
}
/* Add all sysctls under the debug.psm and hw.psm nodes */
@@ -2437,13 +2439,13 @@ next:
(sc->pqueue_end == sc->pqueue_start)) {
if ((sc->state & PSM_SOFTARMED) != 0) {
sc->state &= ~PSM_SOFTARMED;
- untimeout(psmsoftintr, arg, sc->softcallout);
+ callout_stop(&sc->softcallout);
}
psmsoftintr(arg);
} else if ((sc->state & PSM_SOFTARMED) == 0) {
sc->state |= PSM_SOFTARMED;
- sc->softcallout = timeout(psmsoftintr, arg,
- psmhz < 1 ? 1 : (hz/psmhz));
+ callout_reset(&sc->softcallout,
+ psmhz < 1 ? 1 : (hz/psmhz), psmsoftintr, arg);
}
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240213 - stable/8/sys/fs/nfsclient
Author: rmacklem
Date: Fri Sep 7 20:57:36 2012
New Revision: 240213
URL: http://svn.freebsd.org/changeset/base/240213
Log:
MFC: r237244
Fix the NFSv4 client for the case where mmap'd files are
written, but not msync'd by a process. A VOP_PUTPAGES()
called when VOP_RECLAIM() happens will usually fail, since
the NFSv4 Open has already been closed by VOP_INACTIVE().
Add a vm_object_page_clean() call to the NFSv4 client's
VOP_INACTIVE(), so that the write happens before the NFSv4
Open is closed. kib@ suggested using vgone() instead and
I will explore this, but this patch fixes things in the
meantime. For some reason, the VOP_PUTPAGES() is still
attempted in VOP_RECLAIM(), but having this fail doesn't
cause any problems except a "stateid0 in write" being logged.
Modified:
stable/8/sys/fs/nfsclient/nfs_clnode.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/boot/ (props changed)
stable/8/sys/cddl/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/compat/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/ (props changed)
stable/8/sys/dev/e1000/ (props changed)
stable/8/sys/dev/sound/ (props changed)
stable/8/sys/dev/sound/pci/ (props changed)
stable/8/sys/dev/virtio/ (props changed)
stable/8/sys/kern/ (props changed)
stable/8/sys/sys/ (props changed)
stable/8/sys/vm/ (props changed)
Modified: stable/8/sys/fs/nfsclient/nfs_clnode.c
==
--- stable/8/sys/fs/nfsclient/nfs_clnode.c Fri Sep 7 20:57:36 2012
(r240212)
+++ stable/8/sys/fs/nfsclient/nfs_clnode.c Fri Sep 7 20:57:36 2012
(r240213)
@@ -207,18 +207,28 @@ ncl_inactive(struct vop_inactive_args *a
struct nfsnode *np;
struct sillyrename *sp;
struct vnode *vp = ap->a_vp;
+ boolean_t retv;
np = VTONFS(vp);
if (NFS_ISV4(vp) && vp->v_type == VREG) {
/*
* Since mmap()'d files do I/O after VOP_CLOSE(), the NFSv4
-* Close operations are delayed until now. Any dirty buffers
-* must be flushed before the close, so that the stateid is
-* available for the writes.
+* Close operations are delayed until now. Any dirty
+* buffers/pages must be flushed before the close, so that the
+* stateid is available for the writes.
*/
- (void) ncl_flush(vp, MNT_WAIT, NULL, ap->a_td, 1, 0);
- (void) nfsrpc_close(vp, 1, ap->a_td);
+ if (vp->v_object != NULL) {
+ VM_OBJECT_LOCK(vp->v_object);
+ retv = vm_object_page_clean(vp->v_object, 0, 0,
+ OBJPC_SYNC);
+ VM_OBJECT_UNLOCK(vp->v_object);
+ } else
+ retv = TRUE;
+ if (retv == TRUE) {
+ (void)ncl_flush(vp, MNT_WAIT, NULL, ap->a_td, 1, 0);
+ (void)nfsrpc_close(vp, 1, ap->a_td);
+ }
}
mtx_lock(&np->n_mtx);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240214 - head/sys/kern
Author: glebius
Date: Fri Sep 7 21:06:54 2012
New Revision: 240214
URL: http://svn.freebsd.org/changeset/base/240214
Log:
Supply the pr_ctloutput method for local datagram sockets,
so that setsockopt() and getsockopt() work on them.
This makes 'tools/regression/sockets/unix_cmsg -t dgram'
more successful.
Modified:
head/sys/kern/uipc_usrreq.c
Modified: head/sys/kern/uipc_usrreq.c
==
--- head/sys/kern/uipc_usrreq.c Fri Sep 7 20:57:36 2012(r240213)
+++ head/sys/kern/uipc_usrreq.c Fri Sep 7 21:06:54 2012(r240214)
@@ -306,6 +306,7 @@ static struct protosw localsw[] = {
.pr_type = SOCK_DGRAM,
.pr_domain =&localdomain,
.pr_flags = PR_ATOMIC|PR_ADDR|PR_RIGHTS,
+ .pr_ctloutput = &uipc_ctloutput,
.pr_usrreqs = &uipc_usrreqs_dgram
},
{
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r240161 - stable/8/sys/netinet
On 6 Sep 2012, at 11:10, Mikolaj Golub wrote: > Author: trociny > Date: Thu Sep 6 10:10:56 2012 > New Revision: 240161 > URL: http://svn.freebsd.org/changeset/base/240161 > > Log: > Direct commit to stable/8 to fix the mis-merge in r239983: in 8.x > read-locking of the inpcbinfo is not used in the TCP timer code. Thanks for the quick fix! BTW. stuff like this (which was triggered on www.FreeBSD.org) is why we run -stable on FreeBSD.org production servers, so we can find things before they make it into releases. -- Simon L. B. Nielsen ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240217 - stable/9/sys/geom/multipath
Author: thomas
Date: Fri Sep 7 22:30:20 2012
New Revision: 240217
URL: http://svn.freebsd.org/changeset/base/240217
Log:
Merge rev. 239673 from head to stable/9:
(g_multipath_rotate): Fix algorithm so that it does rotate over all good
providers, not just the last two.
Modified:
stable/9/sys/geom/multipath/g_multipath.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/dev/ (props changed)
stable/9/sys/dev/e1000/ (props changed)
stable/9/sys/dev/isp/ (props changed)
stable/9/sys/dev/ixgbe/ (props changed)
stable/9/sys/dev/puc/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/modules/ (props changed)
Modified: stable/9/sys/geom/multipath/g_multipath.c
==
--- stable/9/sys/geom/multipath/g_multipath.c Fri Sep 7 22:16:50 2012
(r240216)
+++ stable/9/sys/geom/multipath/g_multipath.c Fri Sep 7 22:30:20 2012
(r240217)
@@ -590,19 +590,26 @@ g_multipath_destroy_geom(struct gctl_req
static int
g_multipath_rotate(struct g_geom *gp)
{
- struct g_consumer *lcp;
+ struct g_consumer *lcp, *first_good_cp = NULL;
struct g_multipath_softc *sc = gp->softc;
+ int active_cp_seen = 0;
g_topology_assert();
if (sc == NULL)
return (ENXIO);
LIST_FOREACH(lcp, &gp->consumer, consumer) {
if ((lcp->index & MP_BAD) == 0) {
- if (sc->sc_active != lcp)
+ if (first_good_cp == NULL)
+ first_good_cp = lcp;
+ if (active_cp_seen)
break;
}
+ if (sc->sc_active == lcp)
+ active_cp_seen = 1;
}
- if (lcp) {
+ if (lcp == NULL)
+ lcp = first_good_cp;
+ if (lcp && lcp != sc->sc_active) {
sc->sc_active = lcp;
if (sc->sc_active_active != 1)
printf("GEOM_MULTIPATH: %s is now active path in %s\n",
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240218 - in stable/8/sys: . dev/sound geom/multipath
Author: thomas Date: Fri Sep 7 22:34:30 2012 New Revision: 240218 URL: http://svn.freebsd.org/changeset/base/240218 Log: Merge rev. 239673 from head to stable/8: (g_multipath_rotate): Fix algorithm so that it does rotate over all good providers, not just the last two. Modified: stable/8/sys/geom/multipath/g_multipath.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/Makefile (props changed) stable/8/sys/amd64/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/arm/ (props changed) stable/8/sys/boot/ (props changed) stable/8/sys/bsm/ (props changed) stable/8/sys/cam/ (props changed) stable/8/sys/cddl/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/compat/ (props changed) stable/8/sys/conf/ (props changed) stable/8/sys/contrib/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/crypto/ (props changed) stable/8/sys/ddb/ (props changed) stable/8/sys/dev/ (props changed) stable/8/sys/dev/aac/ (props changed) stable/8/sys/dev/acpi_support/ (props changed) stable/8/sys/dev/acpica/ (props changed) stable/8/sys/dev/adb/ (props changed) stable/8/sys/dev/adlink/ (props changed) stable/8/sys/dev/advansys/ (props changed) stable/8/sys/dev/ae/ (props changed) stable/8/sys/dev/age/ (props changed) stable/8/sys/dev/agp/ (props changed) stable/8/sys/dev/aha/ (props changed) stable/8/sys/dev/ahb/ (props changed) stable/8/sys/dev/ahci/ (props changed) stable/8/sys/dev/aic/ (props changed) stable/8/sys/dev/aic7xxx/ (props changed) stable/8/sys/dev/alc/ (props changed) stable/8/sys/dev/ale/ (props changed) stable/8/sys/dev/amd/ (props changed) stable/8/sys/dev/amdsbwd/ (props changed) stable/8/sys/dev/amdtemp/ (props changed) stable/8/sys/dev/amr/ (props changed) stable/8/sys/dev/an/ (props changed) stable/8/sys/dev/arcmsr/ (props changed) stable/8/sys/dev/asmc/ (props changed) stable/8/sys/dev/asr/ (props changed) stable/8/sys/dev/ata/ (props changed) stable/8/sys/dev/ath/ (props changed) stable/8/sys/dev/atkbdc/ (props changed) stable/8/sys/dev/auxio/ (props changed) stable/8/sys/dev/bce/ (props changed) stable/8/sys/dev/bfe/ (props changed) stable/8/sys/dev/bge/ (props changed) stable/8/sys/dev/bktr/ (props changed) stable/8/sys/dev/bm/ (props changed) stable/8/sys/dev/buslogic/ (props changed) stable/8/sys/dev/bwi/ (props changed) stable/8/sys/dev/bwn/ (props changed) stable/8/sys/dev/cardbus/ (props changed) stable/8/sys/dev/cas/ (props changed) stable/8/sys/dev/ce/ (props changed) stable/8/sys/dev/cfe/ (props changed) stable/8/sys/dev/cfi/ (props changed) stable/8/sys/dev/ciss/ (props changed) stable/8/sys/dev/cm/ (props changed) stable/8/sys/dev/cmx/ (props changed) stable/8/sys/dev/coretemp/ (props changed) stable/8/sys/dev/cp/ (props changed) stable/8/sys/dev/cpuctl/ (props changed) stable/8/sys/dev/cpufreq/ (props changed) stable/8/sys/dev/cs/ (props changed) stable/8/sys/dev/ct/ (props changed) stable/8/sys/dev/ctau/ (props changed) stable/8/sys/dev/cx/ (props changed) stable/8/sys/dev/cxgb/ (props changed) stable/8/sys/dev/cxgbe/ (props changed) stable/8/sys/dev/cy/ (props changed) stable/8/sys/dev/dc/ (props changed) stable/8/sys/dev/dcons/ (props changed) stable/8/sys/dev/de/ (props changed) stable/8/sys/dev/digi/ (props changed) stable/8/sys/dev/dpms/ (props changed) stable/8/sys/dev/dpt/ (props changed) stable/8/sys/dev/drm/ (props changed) stable/8/sys/dev/e1000/ (props changed) stable/8/sys/dev/ed/ (props changed) stable/8/sys/dev/eisa/ (props changed) stable/8/sys/dev/en/ (props changed) stable/8/sys/dev/ep/ (props changed) stable/8/sys/dev/esp/ (props changed) stable/8/sys/dev/et/ (props changed) stable/8/sys/dev/ex/ (props changed) stable/8/sys/dev/exca/ (props changed) stable/8/sys/dev/fatm/ (props changed) stable/8/sys/dev/fb/ (props changed) stable/8/sys/dev/fdc/ (props changed) stable/8/sys/dev/fe/ (props changed) stable/8/sys/dev/firewire/ (props changed) stable/8/sys/dev/flash/ (props changed) stable/8/sys/dev/fxp/ (props changed) stable/8/sys/dev/gem/ (props changed) stable/8/sys/dev/glxsb/ (props changed) stable/8/sys/dev/hatm/ (props changed) stable/8/sys/dev/hifn/ (props changed) stable/8/sys/dev/hme/ (props changed) stable/8/sys/dev/hpt27xx/ (props changed) stable/8/sys/dev/hptiop/ (props changed) stable/8/sys/dev/hptmv/ (props changed) stable/8/sys/dev/hptrr/ (props changed) stable/8/sys/dev/hwpmc/ (props changed) stable/8/sys/dev/ic/ (props changed) stable/8/sys/dev/ichsmb/ (props changed) stable/8/sys/dev/ichwd
svn commit: r240219 - head/sys/dev/isp
Author: mjacob
Date: Fri Sep 7 22:45:31 2012
New Revision: 240219
URL: http://svn.freebsd.org/changeset/base/240219
Log:
Remove useless extra test.
Pointed out by: Sascha of DragonFly BSD
MFC after:2 weeks
Modified:
head/sys/dev/isp/isp_pci.c
Modified: head/sys/dev/isp/isp_pci.c
==
--- head/sys/dev/isp/isp_pci.c Fri Sep 7 22:34:30 2012(r240218)
+++ head/sys/dev/isp/isp_pci.c Fri Sep 7 22:45:31 2012(r240219)
@@ -1268,8 +1268,7 @@ isp_pci_rd_reg_1080(ispsoftc_t *isp, int
{
uint32_t rv, oc = 0;
- if ((regoff & _BLK_REG_MASK) == SXP_BLOCK ||
- (regoff & _BLK_REG_MASK) == (SXP_BLOCK|SXP_BANK1_SELECT)) {
+ if ((regoff & _BLK_REG_MASK) == SXP_BLOCK) {
uint32_t tc;
/*
* We will assume that someone has paused the RISC processor.
@@ -1301,8 +1300,7 @@ isp_pci_wr_reg_1080(ispsoftc_t *isp, int
{
int oc = 0;
- if ((regoff & _BLK_REG_MASK) == SXP_BLOCK ||
- (regoff & _BLK_REG_MASK) == (SXP_BLOCK|SXP_BANK1_SELECT)) {
+ if ((regoff & _BLK_REG_MASK) == SXP_BLOCK) {
uint32_t tc;
/*
* We will assume that someone has paused the RISC processor.
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
[PATCH]Re: svn commit: r240119 - head/sys/kern
Hi Bruce!
Did not absorb all details of style(9) yet. But I'm working on that :)
On Wed, 5 Sep 2012 14:18:40 +1000 (EST)
Bruce Evans wrote:
> On Tue, 4 Sep 2012, Aleksandr Rybalko wrote:
>
> > Log:
> > Style fixes.
> >
> > Suggested by: mdf
> > Approved by: adrian (menthor)
>
> The following style bugs remain. (The density of style bugs is low
> enough for them to be easy to fix.)
>
> > Modified: head/sys/kern/subr_hints.c
> > ==
> > --- head/sys/kern/subr_hints.c Tue Sep 4 23:13:24
> > 2012(r240118) +++ head/sys/kern/subr_hints.cTue
> > Sep 4 23:16:55 2012(r240119) @@ -31,8 +31,8 @@ __FBSDID
> > ("$FreeBSD$");
> > #include
> > #include
> > #include
> > -#include
> > #include
> > +#include
>
> Sorting this correctly would be an unrelated fix (it is a prerequisite
> for most headers, since almost any header may use KASSERT()).
Yeah, now I found right place for it.
>
> > #include
>
> Sorting this correctly woruld be an unrelated fix.
>
Yeah, kind of second for kernel.
> >
> > /*
> > @@ -52,9 +52,9 @@ static char *hintp;
>
> Sorting and indenting the static variables would be an unrelated fix.
I swear, I was not touch hintp. Same with checkmethod and use_kenv. :)
>
> > static int
> > sysctl_hintmode(SYSCTL_HANDLER_ARGS)
>
> A bug in svn diff is visible. The variable declaration is worse than
> useless as a header for this block of code.
>
Did not get it. About which variable you saying?
>
> > {
> > - int error, i, from_kenv, value, eqidx;
> > const char *cp;
> > char *line, *eq;
> > + int eqidx, error, from_kenv, i, value;
> >
> > from_kenv = 0;
> > cp = kern_envp;
> > @@ -62,7 +62,7 @@ sysctl_hintmode(SYSCTL_HANDLER_ARGS)
> >
> > /* Fetch candidate for new hintmode value */
>
> Comments (except possibly ones at the right of code) should be real
> sentences. This one is missing a ".", unlike all older comments
> (not at the right of code) in this file.
Fixed.
>
> > error = sysctl_handle_int(oidp, &value, 0, req);
> > - if (error || !req->newptr)
> > + if (error || req->newptr == NULL)
> > return (error);
> >
> > if (value != 2)
>
> This still has a boolean test for the non-boolean `error'. Now the
> older code sets a bad example in all cases where `error' is tested.
Fixed.
>
> > @@ -73,8 +73,11 @@ sysctl_hintmode(SYSCTL_HANDLER_ARGS)
> > switch (hintmode) {
> > case 0:
> > if (dynamic_kenv) {
> > - /* Already here */
> > - hintmode = value; /* XXX: Need we switch
> > or not ? */
> > + /*
> > +* Already here. But assign hintmode to 2,
> > to not
> > +* check it in the future.
> > +*/
>
> Sentence breaks should be 2 spaces, as in all older comments in this
> file, starting as usual with the copyright. But outside of the
> copyright, the style bug of single-space sentence breaks was avoided
> in this file mostly by using the larger style bug of using a new line
> for most new sentences.
Already start delimiting sentences with double space. When folks last
time arguing about it, I found power to read only about 10 first
mails. :)
>
> > + hintmode = 2;
> > return (0);
> > }
> > from_kenv = 1;
> > @@ -98,7 +101,7 @@ sysctl_hintmode(SYSCTL_HANDLER_ARGS)
> > continue;
> > }
> > eq = strchr(cp, '=');
> > - if (!eq)
> > + if (eq == NULL)
> > /* Bad hint value */
> > continue;
> > eqidx = eq - cp;
>
> Bruce
Thank you very much Bruce! I am understand how much important is
code style, but still on the way to that point.
Patch:
-
Index: subr_hints.c
===
--- subr_hints.c(revision 240161)
+++ subr_hints.c(working copy)
@@ -28,12 +28,12 @@
__FBSDID("$FreeBSD$");
#include
+#include
+#include
#include
#include
#include
#include
-#include
-#include
/*
* Access functions for device resources.
@@ -45,7 +45,7 @@ static char *hintp;
/*
* Define kern.hintmode sysctl, which only accept value 2, that cause
to
- * switch from Static KENV mode to Dynamic KENV. So systems that have
hints
+ * switch from Static KENV mode to Dynamic KENV. So systems that have
hints
* compiled into kernel will be able to see/modify KENV (and hints
too). */
@@ -60,21 +60,20 @@ sysctl_hintmode(SYSCTL_HANDLER_ARGS)
cp = kern_envp;
value = hintmode;
- /* Fetch candidate for new hintmode value */
+ /* Fetch candidate for new hintmode value. */
error = sysctl_handle_int(oidp, &value, 0, req);
- if (error || req->
svn commit: r240223 - head/tools/tools/ath/athratestats
Author: adrian
Date: Sat Sep 8 01:14:13 2012
New Revision: 240223
URL: http://svn.freebsd.org/changeset/base/240223
Log:
Add a '-s ' option which will display live rate control
statistics.
Modified:
head/tools/tools/ath/athratestats/Makefile
head/tools/tools/ath/athratestats/main.c
Modified: head/tools/tools/ath/athratestats/Makefile
==
--- head/tools/tools/ath/athratestats/Makefile Fri Sep 7 23:18:13 2012
(r240222)
+++ head/tools/tools/ath/athratestats/Makefile Sat Sep 8 01:14:13 2012
(r240223)
@@ -7,6 +7,8 @@ PROG= athratestats
SRCS= main.c opt_ah.h ah_osdep.h
+LDADD+=-lcurses
+
CLEANFILES+= opt_ah.h ah_osdep.h
.include <../Makefile.inc>
Modified: head/tools/tools/ath/athratestats/main.c
==
--- head/tools/tools/ath/athratestats/main.cFri Sep 7 23:18:13 2012
(r240222)
+++ head/tools/tools/ath/athratestats/main.cSat Sep 8 01:14:13 2012
(r240223)
@@ -48,6 +48,8 @@
#include
#include
+#include
+
#include "ah.h"
#include "ah_desc.h"
#include "net80211/ieee80211_ioctl.h"
@@ -57,12 +59,21 @@
#include "ath_rate/sample/sample.h"
+static int do_loop = 0;
+
/*
* This needs to be big enough to fit the two TLVs, the rate table
* and the rate statistics table for a single node.
*/
#defineSTATS_BUF_SIZE 8192
+#definePRINTMSG(...) do { \
+ if (do_loop == 0) \
+ printf(__VA_ARGS__);\
+ else\
+ printw(__VA_ARGS__);\
+ } while (0)
+
struct ath_ratestats {
int s;
struct ath_rateioctl re;
@@ -96,12 +107,12 @@ ath_sample_stats(struct ath_ratestats *r
uint32_t mask;
int rix, y;
- printf("static_rix (%d) ratemask 0x%x\n",
+ PRINTMSG("static_rix (%d) ratemask 0x%x\n",
sn->static_rix,
sn->ratemask);
for (y = 0; y < NUM_PACKET_SIZE_BINS; y++) {
- printf("[%4u] cur rate %d %s since switch: "
+ PRINTMSG("[%4u] cur rate %d %s since switch: "
"packets %d ticks %u\n",
bin_to_size(y),
dot11rate(rt, sn->current_rix[y]),
@@ -109,7 +120,7 @@ ath_sample_stats(struct ath_ratestats *r
sn->packets_since_switch[y],
sn->ticks_since_switch[y]);
- printf("[%4u] last sample (%d %s) cur sample (%d %s) "
+ PRINTMSG("[%4u] last sample (%d %s) cur sample (%d %s) "
"packets sent %d\n",
bin_to_size(y),
dot11rate(rt, sn->last_sample_rix[y]),
@@ -118,12 +129,12 @@ ath_sample_stats(struct ath_ratestats *r
dot11str(rt, sn->current_sample_rix[y]),
sn->packets_sent[y]);
- printf("[%4u] packets since sample %d sample tt %u\n",
+ PRINTMSG("[%4u] packets since sample %d sample tt %u\n",
bin_to_size(y),
sn->packets_since_sample[y],
sn->sample_tt[y]);
}
- printf(" TX Rate TXTOTAL:TXOK EWMA T/ F"
+ PRINTMSG(" TX Rate TXTOTAL:TXOK EWMA T/ F"
" avg last xmit\n");
for (mask = sn->ratemask, rix = 0; mask != 0; mask >>= 1, rix++) {
if ((mask & 1) == 0)
@@ -131,8 +142,8 @@ ath_sample_stats(struct ath_ratestats *r
for (y = 0; y < NUM_PACKET_SIZE_BINS; y++) {
if (sn->stats[y][rix].total_packets == 0)
continue;
- printf("[%2u %s:%4u] %8ju:%-8ju "
- "(%3d.%1d%%) %8ju/%4d %5ums %u\n",
+ PRINTMSG("[%2u %s:%4u] %8ju:%-8ju "
+ "(%3d.%1d%%) %8ju/%4d %5uuS %u\n",
dot11rate(rt, rix),
dot11str(rt, rix),
bin_to_size(y),
@@ -223,6 +234,29 @@ rate_node_stats(struct ath_ratestats *r,
ath_sample_stats(r, rt, sn);
}
+static void
+fetch_and_print_stats(struct ath_ratestats *r, struct ether_addr *e,
+uint8_t *buf)
+{
+
+ /* Zero the buffer before it's passed in */
+ memset(buf, '\0', STATS_BUF_SIZE);
+
+ /*
+* Set the station address for this lookup.
+*/
+ ath_setsta(r, e->octet);
+
+ /*
+* Fetch the data from the driver.
+*/
+ ath_rate_ioctl(r);
+
+ /*
+* Decode and parse statistics.
+*/
+ rate_node_stats(r, e);
+}
int
main(int argc, char *argv[])
@@ -233,12 +267,14 @@ main(int argc, char *argv[])
struct ether_addr *e;
struct ath_ratestats r;
uint8_t *buf;
+ use
svn commit: r240224 - head/sys/powerpc/wii
Author: rpaulo
Date: Sat Sep 8 01:26:52 2012
New Revision: 240224
URL: http://svn.freebsd.org/changeset/base/240224
Log:
Add IRQ support to the resource list handling functions.
Modified:
head/sys/powerpc/wii/wii_bus.c
Modified: head/sys/powerpc/wii/wii_bus.c
==
--- head/sys/powerpc/wii/wii_bus.c Sat Sep 8 01:14:13 2012
(r240223)
+++ head/sys/powerpc/wii/wii_bus.c Sat Sep 8 01:26:52 2012
(r240224)
@@ -104,6 +104,7 @@ DRIVER_MODULE(wiibus, nexus, wiibus_driv
static void
wiibus_identify(driver_t *driver, device_t parent)
{
+
if (strcmp(installed_platform(), "wii") != 0)
return;
@@ -115,7 +116,6 @@ wiibus_identify(driver_t *driver, device
static int
wiibus_probe(device_t dev)
{
-/* Do not attach to any OF nodes that may be present */
device_set_desc(dev, "Nintendo Wii System Bus");
@@ -127,6 +127,7 @@ wiibus_init_device_resources(struct rman
unsigned int rid, uintptr_t addr, size_t len, unsigned int irq)
{
+
if (!dinfo->di_init) {
resource_list_init(&dinfo->di_resources);
dinfo->di_init++;
@@ -246,7 +247,9 @@ wiibus_alloc_resource(device_t bus, devi
}
rman_set_rid(rv, *rid);
break;
- /* XXX IRQ */
+ case SYS_RES_IRQ:
+ return (resource_list_alloc(&dinfo->di_resources, bus, child,
+ type, rid, start, end, count, flags));
default:
device_printf(bus, "unknown resource request from %s\n",
device_get_nameunit(child));
@@ -280,7 +283,8 @@ wiibus_activate_resource(device_t bus, d
rman_set_bustag(res, &bs_be_tag);
rman_set_bushandle(res, (unsigned long)p);
break;
- /* XXX IRQ */
+ case SYS_RES_IRQ:
+ return (bus_activate_resource(bus, type, rid, res));
default:
device_printf(bus,
"unknown activate resource request from %s\n",
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240225 - stable/9/sys/cddl/compat/opensolaris/sys
Author: eadler
Date: Sat Sep 8 02:41:50 2012
New Revision: 240225
URL: http://svn.freebsd.org/changeset/base/240225
Log:
MFC r230454:
Use provided name when allocating ksid domain. It isn't really used on
FreeBSD,
but should fix a panic when pool is imported from another OS that is
using this.
No objections from; pjd
Approved by: cperciva (implicit)
Modified:
stable/9/sys/cddl/compat/opensolaris/sys/sid.h
Directory Properties:
stable/9/sys/ (props changed)
Modified: stable/9/sys/cddl/compat/opensolaris/sys/sid.h
==
--- stable/9/sys/cddl/compat/opensolaris/sys/sid.h Sat Sep 8 01:26:52
2012(r240224)
+++ stable/9/sys/cddl/compat/opensolaris/sys/sid.h Sat Sep 8 02:41:50
2012(r240225)
@@ -30,7 +30,7 @@
#define_OPENSOLARIS_SYS_SID_H_
typedef struct ksiddomain {
- charkd_name[16];/* Domain part of SID */
+ charkd_name[1]; /* Domain part of SID */
} ksiddomain_t;
typedef void ksid_t;
@@ -39,8 +39,8 @@ ksid_lookupdomain(const char *domain)
{
ksiddomain_t *kd;
- kd = kmem_alloc(sizeof(*kd), KM_SLEEP);
- strlcpy(kd->kd_name, "FreeBSD", sizeof(kd->kd_name));
+ kd = kmem_alloc(sizeof(*kd) + strlen(domain), KM_SLEEP);
+ strcpy(kd->kd_name, domain);
return (kd);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240226 - head/sys/dev/ath
Author: adrian Date: Sat Sep 8 02:56:09 2012 New Revision: 240226 URL: http://svn.freebsd.org/changeset/base/240226 Log: Correctly mask out the RTS/CTS flags when forming aggregates. This had the side effect of clearing HAL_TXDESC_CLRDMASK for a bunch of frames, meaning they'd end up being potentially filtered if there were an error. This is fine in the previous world as they'd just be software retried but now that I'm working on filtered frames, these descriptors would be endlessly retried until another valid frame would come along that had CLRDMASK set. Modified: head/sys/dev/ath/if_ath_tx_ht.c Modified: head/sys/dev/ath/if_ath_tx_ht.c == --- head/sys/dev/ath/if_ath_tx_ht.c Sat Sep 8 02:41:50 2012 (r240225) +++ head/sys/dev/ath/if_ath_tx_ht.c Sat Sep 8 02:56:09 2012 (r240226) @@ -742,7 +742,7 @@ ath_tx_form_aggr(struct ath_softc *sc, s * subsequent frame with this config. */ bf->bf_state.bfs_txflags &= - (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA); + ~ (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA); bf->bf_state.bfs_txflags |= bf_first->bf_state.bfs_txflags & (HAL_TXDESC_RTSENA | HAL_TXDESC_CTSENA); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240227 - stable/7/sbin/mdconfig
Author: eadler
Date: Sat Sep 8 03:10:56 2012
New Revision: 240227
URL: http://svn.freebsd.org/changeset/base/240227
Log:
MFC r238202:
Remove ancient vnconfig symlink
Approved by: cperciva (implicit)
Modified:
stable/7/sbin/mdconfig/Makefile
Directory Properties:
stable/7/sbin/mdconfig/ (props changed)
Modified: stable/7/sbin/mdconfig/Makefile
==
--- stable/7/sbin/mdconfig/Makefile Sat Sep 8 02:56:09 2012
(r240226)
+++ stable/7/sbin/mdconfig/Makefile Sat Sep 8 03:10:56 2012
(r240227)
@@ -2,7 +2,6 @@
PROG= mdconfig
MAN= mdconfig.8
-MLINKS=mdconfig.8 vnconfig.8
DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
LDADD= -lutil -lgeom -lbsdxml -lsbuf
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240228 - stable/8/sbin/mdconfig
Author: eadler
Date: Sat Sep 8 03:10:58 2012
New Revision: 240228
URL: http://svn.freebsd.org/changeset/base/240228
Log:
MFC r238202:
Remove ancient vnconfig symlink
Approved by: cperciva (implicit)
Modified:
stable/8/sbin/mdconfig/Makefile
Directory Properties:
stable/8/sbin/mdconfig/ (props changed)
Modified: stable/8/sbin/mdconfig/Makefile
==
--- stable/8/sbin/mdconfig/Makefile Sat Sep 8 03:10:56 2012
(r240227)
+++ stable/8/sbin/mdconfig/Makefile Sat Sep 8 03:10:58 2012
(r240228)
@@ -2,7 +2,6 @@
PROG= mdconfig
MAN= mdconfig.8
-MLINKS=mdconfig.8 vnconfig.8
DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
LDADD= -lutil -lgeom -lbsdxml -lsbuf
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240229 - stable/9/sbin/mdconfig
Author: eadler
Date: Sat Sep 8 03:11:02 2012
New Revision: 240229
URL: http://svn.freebsd.org/changeset/base/240229
Log:
MFC r238202:
Remove ancient vnconfig symlink
Approved by: cperciva (implicit)
Modified:
stable/9/sbin/mdconfig/Makefile
Directory Properties:
stable/9/sbin/mdconfig/ (props changed)
Modified: stable/9/sbin/mdconfig/Makefile
==
--- stable/9/sbin/mdconfig/Makefile Sat Sep 8 03:10:58 2012
(r240228)
+++ stable/9/sbin/mdconfig/Makefile Sat Sep 8 03:11:02 2012
(r240229)
@@ -2,7 +2,6 @@
PROG= mdconfig
MAN= mdconfig.8
-MLINKS=mdconfig.8 vnconfig.8
DPADD= ${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF}
LDADD= -lutil -lgeom -lbsdxml -lsbuf
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240230 - stable/9
Author: gjb (doc,ports committer)
Date: Sat Sep 8 04:35:54 2012
New Revision: 240230
URL: http://svn.freebsd.org/changeset/base/240230
Log:
MFC r240077:
- Fix 'distributeworld' target when WITHOUT_GAMES is set.
Modified:
stable/9/Makefile.inc1 (contents, props changed)
Modified: stable/9/Makefile.inc1
==
--- stable/9/Makefile.inc1 Sat Sep 8 03:11:02 2012(r240229)
+++ stable/9/Makefile.inc1 Sat Sep 8 04:35:54 2012(r240230)
@@ -640,7 +640,10 @@ ITOOLS=[ awk cap_mkdb cat chflags chmod
#
# Non-base distributions produced by the base system
-EXTRA_DISTRIBUTIONS= doc games
+EXTRA_DISTRIBUTIONS= doc
+.if ${MK_GAMES} != "no"
+EXTRA_DISTRIBUTIONS+= games
+.endif
.if defined(LIB32TMP) && ${MK_LIB32} != "no"
EXTRA_DISTRIBUTIONS+= lib32
.endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240231 - stable/9/cddl/contrib/opensolaris/cmd/zfs
Author: gjb (doc,ports committer) Date: Sat Sep 8 04:42:09 2012 New Revision: 240231 URL: http://svn.freebsd.org/changeset/base/240231 Log: MFC r240153: - Typo fix and minor word swap. PR: 171356 Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Directory Properties: stable/9/cddl/contrib/opensolaris/ (props changed) Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 == --- stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Sep 8 04:35:54 2012(r240230) +++ stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Sep 8 04:42:09 2012(r240231) @@ -22,10 +22,11 @@ .\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2012, Joyent, Inc. All rights reserved. .\" Copyright (c) 2011, Pawel Jakub Dawidek +.\" Copyright (c) 2012, Bryan Drewery .\" .\" $FreeBSD$ .\" -.Dd August 12, 2012 +.Dd September 5, 2012 .Dt ZFS 8 .Os .Sh NAME @@ -1076,7 +1077,7 @@ bit is respected for the file system. Th .It Sy sharesmb Ns = Ns Cm on | off | Ar opts The .Sy sharesmb -property has currently no effect o +property currently has no effect on .Fx . .It Sy sharenfs Ns = Ns Cm on | off | Ar opts Controls whether the file system is shared via @@ -2022,7 +2023,7 @@ The default is .Pp The default can be changed to include group types. .It Fl i -Translate SID to POSIX ID. This flag has currently no effect on +Translate SID to POSIX ID. This flag currently has no effect on .Fx . .El .It Xo ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240232 - stable/8/cddl/contrib/opensolaris/cmd/zfs
Author: gjb (doc,ports committer) Date: Sat Sep 8 04:42:33 2012 New Revision: 240232 URL: http://svn.freebsd.org/changeset/base/240232 Log: MFC r240153: - Typo fix and minor word swap. PR: 171356 Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Directory Properties: stable/8/cddl/contrib/opensolaris/ (props changed) Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 == --- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Sep 8 04:42:09 2012(r240231) +++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs.8 Sat Sep 8 04:42:33 2012(r240232) @@ -22,10 +22,11 @@ .\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved. .\" Copyright (c) 2012, Joyent, Inc. All rights reserved. .\" Copyright (c) 2011, Pawel Jakub Dawidek +.\" Copyright (c) 2012, Bryan Drewery .\" .\" $FreeBSD$ .\" -.Dd August 12, 2012 +.Dd September 5, 2012 .Dt ZFS 8 .Os .Sh NAME @@ -1076,7 +1077,7 @@ bit is respected for the file system. Th .It Sy sharesmb Ns = Ns Cm on | off | Ar opts The .Sy sharesmb -property has currently no effect o +property currently has no effect on .Fx . .It Sy sharenfs Ns = Ns Cm on | off | Ar opts Controls whether the file system is shared via @@ -2022,7 +2023,7 @@ The default is .Pp The default can be changed to include group types. .It Fl i -Translate SID to POSIX ID. This flag has currently no effect on +Translate SID to POSIX ID. This flag currently has no effect on .Fx . .El .It Xo ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r240233 - in head: . contrib/pf/man contrib/pf/pfctl sys/contrib/altq/altq sys/contrib/pf/net sys/modules/pf sys/net sys/netinet sys/netinet/ipfw sys/netinet6 sys/netipsec sys/sys usr.b...
Author: glebius Date: Sat Sep 8 06:41:54 2012 New Revision: 240233 URL: http://svn.freebsd.org/changeset/base/240233 Log: Merge the projects/pf/head branch, that was worked on for last six months, into head. The most significant achievements in the new code: o Fine grained locking, thus much better performance. o Fixes to many problems in pf, that were specific to FreeBSD port. New code doesn't have that many ifdefs and much less OpenBSDisms, thus is more attractive to our developers. Those interested in details, can browse through SVN log of the projects/pf/head branch. And for reference, here is exact list of revisions merged: r232043, r232044, r232062, r232148, r232149, r232150, r232298, r232330, r232332, r232340, r232386, r232390, r232391, r232605, r232655, r232656, r232661, r232662, r232663, r232664, r232673, r232691, r233309, r233782, r233829, r233830, r233834, r233835, r233836, r233865, r233866, r233868, r233873, r234056, r234096, r234100, r234108, r234175, r234187, r234223, r234271, r234272, r234282, r234307, r234309, r234382, r234384, r234456, r234486, r234606, r234640, r234641, r234642, r234644, r234651, r235505, r235506, r235535, r235605, r235606, r235826, r235991, r235993, r236168, r236173, r236179, r236180, r236181, r236186, r236223, r236227, r236230, r236252, r236254, r236298, r236299, r236300, r236301, r236397, r236398, r236399, r236499, r236512, r236513, r236525, r236526, r236545, r236548, r236553, r236554, r236556, r236557, r236561, r236570, r236630, r236672, r236673, r236679, r236706, r236710, r236718, r237154, r237155, r237169, r237314, r237363, r237364, r237368, r237369, r237376, r237440, r237442, r237751, r237783, r237784, r237785, r237788, r237791, r238421, r238522, r238523, r238524, r238525, r239173, r239186, r239644, r239652, r239661, r239773, r240125, r240130, r240131, r240136, r240186, r240196, r240212. I'd like to thank people who participated in early testing: Tested by:Florian Smeets Tested by:Chekaluk Vitaly Tested by:Ben Wilber Tested by:Ian FREISLICH Deleted: head/sys/contrib/pf/net/if_pflow.h Modified: head/UPDATING head/contrib/pf/man/pf.4 head/contrib/pf/man/pf.conf.5 head/contrib/pf/pfctl/parse.y head/contrib/pf/pfctl/pf_print_state.c head/contrib/pf/pfctl/pfctl.c head/contrib/pf/pfctl/pfctl_parser.c head/contrib/pf/pfctl/pfctl_table.c head/sys/contrib/altq/altq/altq_cbq.c head/sys/contrib/altq/altq/altq_hfsc.c head/sys/contrib/altq/altq/altq_priq.c head/sys/contrib/altq/altq/altq_subr.c head/sys/contrib/pf/net/if_pflog.c head/sys/contrib/pf/net/if_pflog.h head/sys/contrib/pf/net/if_pfsync.c head/sys/contrib/pf/net/if_pfsync.h head/sys/contrib/pf/net/pf.c head/sys/contrib/pf/net/pf_if.c head/sys/contrib/pf/net/pf_ioctl.c head/sys/contrib/pf/net/pf_lb.c head/sys/contrib/pf/net/pf_mtag.h head/sys/contrib/pf/net/pf_norm.c head/sys/contrib/pf/net/pf_osfp.c head/sys/contrib/pf/net/pf_ruleset.c head/sys/contrib/pf/net/pf_table.c head/sys/contrib/pf/net/pfvar.h head/sys/modules/pf/Makefile head/sys/net/if.c head/sys/netinet/in_gif.c head/sys/netinet/ip_icmp.c head/sys/netinet/ipfw/ip_fw2.c head/sys/netinet/raw_ip.c head/sys/netinet/tcp_subr.c head/sys/netinet6/icmp6.c head/sys/netinet6/in6_gif.c head/sys/netipsec/ipsec_input.c head/sys/netipsec/ipsec_output.c head/sys/netipsec/xform_ipip.c head/sys/sys/mbuf.h head/sys/sys/param.h head/usr.bin/netstat/if.c head/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt head/usr.sbin/bsnmpd/modules/snmp_pf/pf_snmp.c head/usr.sbin/bsnmpd/modules/snmp_pf/pf_tree.def Modified: head/UPDATING == --- head/UPDATING Sat Sep 8 04:42:33 2012(r240232) +++ head/UPDATING Sat Sep 8 06:41:54 2012(r240233) @@ -24,6 +24,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20120908: + The pf(4) packet filter ABI has been changed. pfctl(8) and + snmp_pf module need to be recompiled to work with new kernel. + 20120828: A new ZFS feature flag "com.delphix:empty_bpobj" has been merged to -HEAD. Pools that have empty_bpobj in active state can not be Modified: head/contrib/pf/man/pf.4 == --- head/contrib/pf/man/pf.4Sat Sep 8 04:42:33 2012(r240232) +++ head/contrib/pf/man/pf.4Sat Sep 8 06:41:54 2012(r240233) @@ -28,7 +28,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 17 2011 +.Dd June 29 2012 .Dt PF 4 .Os .Sh NAME @@ -75,6 +75,25 @@ separated by characters, similar to how file system hierarchies are laid out. The final component of the anchor path is the anchor under which operations will be performed. +.Sh SYSCTL VAR
