From owner-svn-src-projects@FreeBSD.ORG Fri Mar 2 22:20:16 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 919DB106566B; Fri, 2 Mar 2012 22:20:16 +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 7D6098FC19; Fri, 2 Mar 2012 22:20:16 +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 q22MKGjO049977; Fri, 2 Mar 2012 22:20:16 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q22MKGLI049975; Fri, 2 Mar 2012 22:20:16 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201203022220.q22MKGLI049975@svn.freebsd.org> From: Xin LI Date: Fri, 2 Mar 2012 22:20:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r232412 - projects/head_mfi/sys/dev/mfi X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Mar 2012 22:20:16 -0000 Author: delphij Date: Fri Mar 2 22:20:15 2012 New Revision: 232412 URL: http://svn.freebsd.org/changeset/base/232412 Log: Put wildcard pattern later in the match table. Otherwise the more specific matches will not get a chance to win. Modified: projects/head_mfi/sys/dev/mfi/mfi_pci.c Modified: projects/head_mfi/sys/dev/mfi/mfi_pci.c ============================================================================== --- projects/head_mfi/sys/dev/mfi/mfi_pci.c Fri Mar 2 22:00:40 2012 (r232411) +++ projects/head_mfi/sys/dev/mfi/mfi_pci.c Fri Mar 2 22:20:15 2012 (r232412) @@ -121,9 +121,9 @@ struct mfi_ident { int flags; const char *desc; } mfi_identifiers[] = { - {0x1000, 0x005B, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "ThunderBolt"}, {0x1000, 0x005B, 0x8086, 0x9265, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Intel (R) RAID Controller RS25DB080"}, {0x1000, 0x005B, 0x8086, 0x9285, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "Intel (R) RAID Controller RS25NB008"}, + {0x1000, 0x005B, 0xffff, 0xffff, MFI_FLAGS_SKINNY| MFI_FLAGS_TBOLT, "ThunderBolt"}, {0x1000, 0x0060, 0x1028, 0xffff, MFI_FLAGS_1078, "Dell PERC 6"}, {0x1000, 0x0060, 0xffff, 0xffff, MFI_FLAGS_1078, "LSI MegaSAS 1078"}, {0x1000, 0x0071, 0xffff, 0xffff, MFI_FLAGS_SKINNY, "Drake Skinny"},