From owner-cvs-all@FreeBSD.ORG Sun Jul 3 01:02:08 2005 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A6E3F16A9A5; Sun, 3 Jul 2005 00:57:20 +0000 (GMT) (envelope-from ps@mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.FreeBSD.org (Postfix) with ESMTP id B401D440F9; Sun, 3 Jul 2005 00:38:17 +0000 (GMT) (envelope-from ps@mu.org) Received: by elvis.mu.org (Postfix, from userid 1000) id 98A166D931; Sat, 2 Jul 2005 17:37:35 -0700 (PDT) X-Original-To: ps@mu.org Delivered-To: ps@mu.org Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by elvis.mu.org (Postfix) with ESMTP id EE0DA5CA09 for ; Sun, 16 Jan 2005 22:54:55 -0800 (PST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 8727656BA8 for ; Mon, 17 Jan 2005 06:54:55 +0000 (GMT) (envelope-from owner-src-committers@FreeBSD.org) Received: by hub.freebsd.org (Postfix) id 9991B16A4F1; Mon, 17 Jan 2005 06:54:51 +0000 (GMT) Delivered-To: ps@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 538) id D376C16A4D0; Mon, 17 Jan 2005 06:54:49 +0000 (GMT) Delivered-To: src-committers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D820916A4CE; Mon, 17 Jan 2005 06:54:48 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B10BE43D49; Mon, 17 Jan 2005 06:54:48 +0000 (GMT) (envelope-from imp@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j0H6sm42026549; Mon, 17 Jan 2005 06:54:48 GMT (envelope-from imp@repoman.freebsd.org) Received: (from imp@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j0H6smLN026548; Mon, 17 Jan 2005 06:54:48 GMT (envelope-from imp) Message-Id: <200501170654.j0H6smLN026548@repoman.freebsd.org> From: Warner Losh To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Sender: owner-src-committers@FreeBSD.org Precedence: bulk X-Loop: FreeBSD.ORG X-Spam-Checker-Version: SpamAssassin 3.0.1 (2004-10-22) on elvis.mu.org X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.0.1 X-Spam-Level: Cc: Subject: cvs commit: src/sys/dev/pccard pccard.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Date: Sun, 03 Jul 2005 01:02:08 -0000 X-Original-Date: Mon, 17 Jan 2005 06:54:48 +0000 (UTC) X-List-Received-Date: Sun, 03 Jul 2005 01:02:08 -0000 imp 2005-01-17 06:54:48 UTC FreeBSD src repository Modified files: sys/dev/pccard pccard.c Log: Go ahead and match on CIS3 and CIS4 strings as well. These are NULL for the vast majority of our cards. However, they are critically needed to distinguish different fe based PC Cards (the FMV-182 from the 182A) which need to be treated differently (the ethernet address is loaded not from the standard CIS-based ethernet tuples, but from differing locations in attribute space based on the version string in CIS3. This should have no impact for other users of this function. Revision Changes Path 1.95 +14 -1 src/sys/dev/pccard/pccard.c