From owner-svn-src-stable@FreeBSD.ORG Sun Aug 5 23:59:33 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6E474106566B; Sun, 5 Aug 2012 23:59:33 +0000 (UTC) (envelope-from kensmith@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 584188FC16; Sun, 5 Aug 2012 23:59:33 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q75NxXgi054797; Sun, 5 Aug 2012 23:59:33 GMT (envelope-from kensmith@svn.freebsd.org) Received: (from kensmith@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q75NxX6A054795; Sun, 5 Aug 2012 23:59:33 GMT (envelope-from kensmith@svn.freebsd.org) Message-Id: <201208052359.q75NxX6A054795@svn.freebsd.org> From: Ken Smith Date: Sun, 5 Aug 2012 23:59:33 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239081 - stable/9/sys/sys X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Aug 2012 23:59:33 -0000 Author: kensmith Date: Sun Aug 5 23:59:32 2012 New Revision: 239081 URL: http://svn.freebsd.org/changeset/base/239081 Log: Since releng/9.1 has been copied bump __FreeBSD_version so stable/9 will not have a value lower than what will be in releng/9.1 shortly. Approved by: re (implicit) Modified: stable/9/sys/sys/param.h Modified: stable/9/sys/sys/param.h ============================================================================== --- stable/9/sys/sys/param.h Sun Aug 5 23:54:33 2012 (r239080) +++ stable/9/sys/sys/param.h Sun Aug 5 23:59:32 2012 (r239081) @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 900506 /* Master, propagated to newvers */ +#define __FreeBSD_version 901500 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From owner-svn-src-stable@FreeBSD.ORG Mon Aug 6 21:33:12 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5C25B106567C; Mon, 6 Aug 2012 21:33:12 +0000 (UTC) (envelope-from simon@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 441558FC20; Mon, 6 Aug 2012 21:33:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q76LXCTS085119; Mon, 6 Aug 2012 21:33:12 GMT (envelope-from simon@svn.freebsd.org) Received: (from simon@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q76LXCBo085117; Mon, 6 Aug 2012 21:33:12 GMT (envelope-from simon@svn.freebsd.org) Message-Id: <201208062133.q76LXCBo085117@svn.freebsd.org> From: "Simon L. Nielsen" Date: Mon, 6 Aug 2012 21:33:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239108 - releng/7.4 releng/7.4/contrib/bind9/lib/dns releng/7.4/sys/conf releng/8.1 releng/8.1/contrib/bind9/lib/dns releng/8.1/sys/conf releng/8.2 releng/8.2/contrib/bind9/lib/dns rel... X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Aug 2012 21:33:12 -0000 Author: simon Date: Mon Aug 6 21:33:11 2012 New Revision: 239108 URL: http://svn.freebsd.org/changeset/base/239108 Log: Fix named(8) DNSSEC validation Denial of Service. Security: FreeBSD-SA-12:05.bind Security: CVE-2012-3817 Obtained from: ISC Approved by: so (simon) Modified: stable/7/contrib/bind9/lib/dns/resolver.c Changes in other areas also in this revision: Modified: releng/7.4/UPDATING releng/7.4/contrib/bind9/lib/dns/resolver.c releng/7.4/sys/conf/newvers.sh releng/8.1/UPDATING releng/8.1/contrib/bind9/lib/dns/resolver.c releng/8.1/sys/conf/newvers.sh releng/8.2/UPDATING releng/8.2/contrib/bind9/lib/dns/resolver.c releng/8.2/sys/conf/newvers.sh releng/8.3/UPDATING releng/8.3/contrib/bind9/lib/dns/resolver.c releng/8.3/sys/conf/newvers.sh releng/9.0/UPDATING releng/9.0/contrib/bind9/lib/dns/resolver.c releng/9.0/sys/conf/newvers.sh Modified: stable/7/contrib/bind9/lib/dns/resolver.c ============================================================================== --- stable/7/contrib/bind9/lib/dns/resolver.c Mon Aug 6 21:24:43 2012 (r239107) +++ stable/7/contrib/bind9/lib/dns/resolver.c Mon Aug 6 21:33:11 2012 (r239108) @@ -7620,6 +7620,7 @@ dns_resolver_addbadcache(dns_resolver_t } bad->type = type; bad->hashval = hashval; + bad->expire = *expire; isc_buffer_init(&buffer, bad + 1, name->length); dns_name_init(&bad->name, NULL); dns_name_copy(name, &bad->name, &buffer); @@ -7631,8 +7632,8 @@ dns_resolver_addbadcache(dns_resolver_t if (resolver->badcount < resolver->badhash * 2 && resolver->badhash > DNS_BADCACHE_SIZE) resizehash(resolver, &now, ISC_FALSE); - } - bad->expire = *expire; + } else + bad->expire = *expire; cleanup: UNLOCK(&resolver->lock); } From owner-svn-src-stable@FreeBSD.ORG Wed Aug 8 20:05:25 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AD6F0106566C; Wed, 8 Aug 2012 20:05:25 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 978F28FC0C; Wed, 8 Aug 2012 20:05:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q78K5PLm022204; Wed, 8 Aug 2012 20:05:25 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q78K5PJU022202; Wed, 8 Aug 2012 20:05:25 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201208082005.q78K5PJU022202@svn.freebsd.org> From: Michael Tuexen Date: Wed, 8 Aug 2012 20:05:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239146 - stable/8/sys/netinet X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2012 20:05:25 -0000 Author: tuexen Date: Wed Aug 8 20:05:25 2012 New Revision: 239146 URL: http://svn.freebsd.org/changeset/base/239146 Log: MFC r239041: Fix a bug reported by Simon L. B. Nielsen: If an SCTP endpoint receives an ASCONF with a wildcard lookup address and incorrect verification tag, the system crashes. This bug was found by Shaun Colley. Modified: stable/8/sys/netinet/sctp_pcb.c Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/netinet/sctp_pcb.c ============================================================================== --- stable/8/sys/netinet/sctp_pcb.c Wed Aug 8 19:15:01 2012 (r239145) +++ stable/8/sys/netinet/sctp_pcb.c Wed Aug 8 20:05:25 2012 (r239146) @@ -2050,8 +2050,6 @@ sctp_findassoc_by_vtag(struct sockaddr * struct sctp_nets *net; struct sctp_tcb *stcb; - *netp = NULL; - *inp_p = NULL; SCTP_INP_INFO_RLOCK(); head = &SCTP_BASE_INFO(sctp_asochash)[SCTP_PCBHASH_ASOC(vtag, SCTP_BASE_INFO(hashasocmark))]; From owner-svn-src-stable@FreeBSD.ORG Wed Aug 8 20:08:45 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E5CD7106566C; Wed, 8 Aug 2012 20:08:45 +0000 (UTC) (envelope-from tuexen@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D08678FC0C; Wed, 8 Aug 2012 20:08:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q78K8jVO022535; Wed, 8 Aug 2012 20:08:45 GMT (envelope-from tuexen@svn.freebsd.org) Received: (from tuexen@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q78K8jdm022533; Wed, 8 Aug 2012 20:08:45 GMT (envelope-from tuexen@svn.freebsd.org) Message-Id: <201208082008.q78K8jdm022533@svn.freebsd.org> From: Michael Tuexen Date: Wed, 8 Aug 2012 20:08:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239147 - stable/8/sys/netinet X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2012 20:08:46 -0000 Author: tuexen Date: Wed Aug 8 20:08:45 2012 New Revision: 239147 URL: http://svn.freebsd.org/changeset/base/239147 Log: MFC r239052: Fix a refcount issue. The called only decrements is stcb is NULL. Modified: stable/8/sys/netinet/sctp_pcb.c Directory Properties: stable/8/sys/ (props changed) Modified: stable/8/sys/netinet/sctp_pcb.c ============================================================================== --- stable/8/sys/netinet/sctp_pcb.c Wed Aug 8 20:05:25 2012 (r239146) +++ stable/8/sys/netinet/sctp_pcb.c Wed Aug 8 20:08:45 2012 (r239147) @@ -2423,10 +2423,9 @@ sctp_findassociation_ep_asconf(struct mb if (zero_address) { stcb = sctp_findassoc_by_vtag(NULL, to, ntohl(sh->v_tag), inp_p, netp, sh->src_port, sh->dest_port, 1, vrf_id, 0); - /* - * SCTP_PRINTF("findassociation_ep_asconf: zero lookup - * address finds stcb 0x%x\n", (uint32_t)stcb); - */ + if (stcb != NULL) { + SCTP_INP_DECR_REF(*inp_p); + } } else { stcb = sctp_findassociation_ep_addr(inp_p, (struct sockaddr *)&remote_store, netp, From owner-svn-src-stable@FreeBSD.ORG Wed Aug 8 20:21:34 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8D267106564A; Wed, 8 Aug 2012 20:21:34 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5D9228FC12; Wed, 8 Aug 2012 20:21:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q78KLYeP023753; Wed, 8 Aug 2012 20:21:34 GMT (envelope-from imp@svn.freebsd.org) Received: (from imp@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q78KLYii023749; Wed, 8 Aug 2012 20:21:34 GMT (envelope-from imp@svn.freebsd.org) Message-Id: <201208082021.q78KLYii023749@svn.freebsd.org> From: Warner Losh Date: Wed, 8 Aug 2012 20:21:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239148 - stable/9/sys/geom X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Aug 2012 20:21:34 -0000 Author: imp Date: Wed Aug 8 20:21:33 2012 New Revision: 239148 URL: http://svn.freebsd.org/changeset/base/239148 Log: Make the addition of the d_gone binary compatible. This allows storage drivers compiled for 9.0 to work on 9.1 and preserves the ABI for disks. Reviewed by: scottl, ken Approved by: re@ (kensmith) MFS after: releng/9.1 gets sorted Modified: stable/9/sys/geom/geom_disk.c stable/9/sys/geom/geom_disk.h Modified: stable/9/sys/geom/geom_disk.c ============================================================================== --- stable/9/sys/geom/geom_disk.c Wed Aug 8 20:08:45 2012 (r239147) +++ stable/9/sys/geom/geom_disk.c Wed Aug 8 20:21:33 2012 (r239148) @@ -509,7 +509,14 @@ g_disk_providergone(struct g_provider *p dp = sc->dp; - if (dp->d_gone != NULL) + /* + * FreeBSD 9 started with VERSION_01 of the struct disk structure. + * However, g_gone was added in the middle of the branch. To + * cope with version being missing from struct disk, we set a flag + * in g_disk_create for VERSION_01 and avoid touching the d_gone + * field for old consumers. + */ + if (!(dp->d_flags & DISKFLAG_LACKS_GONE) && dp->d_gone != NULL) dp->d_gone(dp); } @@ -577,7 +584,7 @@ disk_alloc() void disk_create(struct disk *dp, int version) { - if (version != DISK_VERSION_02) { + if (version != DISK_VERSION_02 && version != DISK_VERSION_01) { printf("WARNING: Attempt to add disk %s%d %s", dp->d_name, dp->d_unit, " using incompatible ABI version of disk(9)\n"); @@ -585,6 +592,8 @@ disk_create(struct disk *dp, int version dp->d_name, dp->d_unit); return; } + if (version == DISK_VERSION_01) + dp->d_flags |= DISKFLAG_LACKS_GONE; KASSERT(dp->d_strategy != NULL, ("disk_create need d_strategy")); KASSERT(dp->d_name != NULL, ("disk_create need d_name")); KASSERT(*dp->d_name != 0, ("disk_create need d_name")); Modified: stable/9/sys/geom/geom_disk.h ============================================================================== --- stable/9/sys/geom/geom_disk.h Wed Aug 8 20:08:45 2012 (r239147) +++ stable/9/sys/geom/geom_disk.h Wed Aug 8 20:21:33 2012 (r239148) @@ -78,7 +78,6 @@ struct disk { disk_ioctl_t *d_ioctl; dumper_t *d_dump; disk_getattr_t *d_getattr; - disk_gone_t *d_gone; /* Info fields from driver to geom_disk.c. Valid when open */ u_int d_sectorsize; @@ -97,12 +96,16 @@ struct disk { /* Fields private to the driver */ void *d_drv1; + + /* new fields in stable - don't use if DISKFLAG_LACKS_GONE is set */ + disk_gone_t *d_gone; }; #define DISKFLAG_NEEDSGIANT 0x1 #define DISKFLAG_OPEN 0x2 #define DISKFLAG_CANDELETE 0x4 #define DISKFLAG_CANFLUSHCACHE 0x8 +#define DISKFLAG_LACKS_GONE 0x10 struct disk *disk_alloc(void); void disk_create(struct disk *disk, int version); From owner-svn-src-stable@FreeBSD.ORG Thu Aug 9 20:22:24 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EA74C106564A; Thu, 9 Aug 2012 20:22:24 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D33818FC0C; Thu, 9 Aug 2012 20:22:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q79KMOfZ049443; Thu, 9 Aug 2012 20:22:24 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q79KMOo9049440; Thu, 9 Aug 2012 20:22:24 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201208092022.q79KMOo9049440@svn.freebsd.org> From: Xin LI Date: Thu, 9 Aug 2012 20:22:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239158 - stable/8/sys/dev/mlx X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2012 20:22:25 -0000 Author: delphij Date: Thu Aug 9 20:22:24 2012 New Revision: 239158 URL: http://svn.freebsd.org/changeset/base/239158 Log: MFC r238997: Correct a typo. Reported by: Sascha Wildner Reviewed by: scottl Modified: stable/8/sys/dev/mlx/mlxvar.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) Modified: stable/8/sys/dev/mlx/mlxvar.h ============================================================================== --- stable/8/sys/dev/mlx/mlxvar.h Thu Aug 9 19:26:13 2012 (r239157) +++ stable/8/sys/dev/mlx/mlxvar.h Thu Aug 9 20:22:24 2012 (r239158) @@ -47,7 +47,7 @@ * making that fit cleanly without crossing page boundaries requires rounding up * to the next power of two. */ -#define MLX_MAXPHYS (128 * 124) +#define MLX_MAXPHYS (128 * 1024) #define MLX_NSEG 64 #define MLX_NSLOTS 256 /* max number of command slots */ From owner-svn-src-stable@FreeBSD.ORG Thu Aug 9 20:27:12 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4C57C106566B; Thu, 9 Aug 2012 20:27:12 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 372AF8FC12; Thu, 9 Aug 2012 20:27:12 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q79KRCHn049897; Thu, 9 Aug 2012 20:27:12 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q79KRBV6049895; Thu, 9 Aug 2012 20:27:11 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201208092027.q79KRBV6049895@svn.freebsd.org> From: Xin LI Date: Thu, 9 Aug 2012 20:27:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r239159 - stable/8/sys/dev/hptiop X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Aug 2012 20:27:12 -0000 Author: delphij Date: Thu Aug 9 20:27:11 2012 New Revision: 239159 URL: http://svn.freebsd.org/changeset/base/239159 Log: MFC r239084: Add PCI IDs for various new High Point RocketRAID 43xx and 3xxx devices. Obtained from: FreeNAS MFC after: 3 days Modified: stable/8/sys/dev/hptiop/hptiop.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/dev/ (props changed) Modified: stable/8/sys/dev/hptiop/hptiop.c ============================================================================== --- stable/8/sys/dev/hptiop/hptiop.c Thu Aug 9 20:22:24 2012 (r239158) +++ stable/8/sys/dev/hptiop/hptiop.c Thu Aug 9 20:27:11 2012 (r239159) @@ -1284,9 +1284,13 @@ static int hptiop_probe(device_t dev) id = pci_get_device(dev); switch (id) { - case 0x4322: - case 0x4321: + case 0x4210: + case 0x4211: + case 0x4310: + case 0x4311: case 0x4320: + case 0x4321: + case 0x4322: sas = 1; case 0x3220: case 0x3320: @@ -1296,12 +1300,14 @@ static int hptiop_probe(device_t dev) case 0x3511: case 0x3521: case 0x3522: + case 0x3530: case 0x3540: + case 0x3560: ops = &hptiop_itl_ops; break; + case 0x3020: case 0x3120: case 0x3122: - case 0x3020: ops = &hptiop_mv_ops; break; default: