From owner-svn-src-all@FreeBSD.ORG Fri May 8 14:01:40 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A21861065674; Fri, 8 May 2009 14:01:40 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 749B98FC21; Fri, 8 May 2009 14:01:40 +0000 (UTC) (envelope-from philip@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n48E1eWJ093043; Fri, 8 May 2009 14:01:40 GMT (envelope-from philip@svn.freebsd.org) Received: (from philip@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n48E1eWA093041; Fri, 8 May 2009 14:01:40 GMT (envelope-from philip@svn.freebsd.org) Message-Id: <200905081401.n48E1eWA093041@svn.freebsd.org> From: Philip Paeps Date: Fri, 8 May 2009 14:01:40 +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: r191913 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb dev/ubsec X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 May 2009 14:01:41 -0000 Author: philip Date: Fri May 8 14:01:40 2009 New Revision: 191913 URL: http://svn.freebsd.org/changeset/base/191913 Log: MFC r191894: Add PCI IDs for the Broadcom 5825 incarnation. Modified: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) stable/7/sys/dev/ath/ath_hal/ (props changed) stable/7/sys/dev/cxgb/ (props changed) stable/7/sys/dev/ubsec/ubsec.c stable/7/sys/dev/ubsec/ubsecreg.h Modified: stable/7/sys/dev/ubsec/ubsec.c ============================================================================== --- stable/7/sys/dev/ubsec/ubsec.c Fri May 8 13:44:33 2009 (r191912) +++ stable/7/sys/dev/ubsec/ubsec.c Fri May 8 14:01:40 2009 (r191913) @@ -220,7 +220,8 @@ ubsec_probe(device_t dev) pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5820 || pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 || pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822 || - pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823 + pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823 || + pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5825 )) return (BUS_PROBE_DEFAULT); return (ENXIO); @@ -240,6 +241,7 @@ ubsec_partname(struct ubsec_softc *sc) case PCI_PRODUCT_BROADCOM_5821: return "Broadcom 5821"; case PCI_PRODUCT_BROADCOM_5822: return "Broadcom 5822"; case PCI_PRODUCT_BROADCOM_5823: return "Broadcom 5823"; + case PCI_PRODUCT_BROADCOM_5825: return "Broadcom 5825"; } return "Broadcom unknown-part"; case PCI_VENDOR_BLUESTEEL: @@ -301,7 +303,8 @@ ubsec_attach(device_t dev) if ((pci_get_vendor(dev) == PCI_VENDOR_BROADCOM && (pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5821 || pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5822 || - pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823)) || + pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5823 || + pci_get_device(dev) == PCI_PRODUCT_BROADCOM_5825)) || (pci_get_vendor(dev) == PCI_VENDOR_SUN && (pci_get_device(dev) == PCI_PRODUCT_SUN_SCA1K || pci_get_device(dev) == PCI_PRODUCT_SUN_5821))) { Modified: stable/7/sys/dev/ubsec/ubsecreg.h ============================================================================== --- stable/7/sys/dev/ubsec/ubsecreg.h Fri May 8 13:44:33 2009 (r191912) +++ stable/7/sys/dev/ubsec/ubsecreg.h Fri May 8 14:01:40 2009 (r191913) @@ -62,6 +62,7 @@ #define PCI_PRODUCT_BROADCOM_5821 0x5821 /* 5821 */ #define PCI_PRODUCT_BROADCOM_5822 0x5822 /* 5822 */ #define PCI_PRODUCT_BROADCOM_5823 0x5823 /* 5823 */ +#define PCI_PRODUCT_BROADCOM_5825 0x5825 /* 5825 */ /* Sun Microsystems */ #define PCI_PRODUCT_SUN_5821 0x5454 /* Crypto 5821 */