From owner-svn-src-stable-9@FreeBSD.ORG Wed Mar 5 19:48:48 2014 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 07D48C7E; Wed, 5 Mar 2014 19:48:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CE214614; Wed, 5 Mar 2014 19:48:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s25Jml9w069951; Wed, 5 Mar 2014 19:48:47 GMT (envelope-from dumbbell@svn.freebsd.org) Received: (from dumbbell@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s25Jml5o069948; Wed, 5 Mar 2014 19:48:47 GMT (envelope-from dumbbell@svn.freebsd.org) Message-Id: <201403051948.s25Jml5o069948@svn.freebsd.org> From: Jean-Sebastien Pedron Date: Wed, 5 Mar 2014 19:48:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r262803 - stable/9/sys/dev/ixgb X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Mar 2014 19:48:48 -0000 Author: dumbbell Date: Wed Mar 5 19:48:47 2014 New Revision: 262803 URL: http://svnweb.freebsd.org/changeset/base/262803 Log: MFC r253102: Remove redundant definitions to appease tinderbox. Note: This MFC is required by a future merge of changes to amd64's and i386's atomic.h. Modified: stable/9/sys/dev/ixgb/if_ixgb.c stable/9/sys/dev/ixgb/ixgb_ids.h Directory Properties: stable/9/sys/ (props changed) stable/9/sys/dev/ (props changed) Modified: stable/9/sys/dev/ixgb/if_ixgb.c ============================================================================== --- stable/9/sys/dev/ixgb/if_ixgb.c Wed Mar 5 19:45:21 2014 (r262802) +++ stable/9/sys/dev/ixgb/if_ixgb.c Wed Mar 5 19:48:47 2014 (r262803) @@ -72,8 +72,8 @@ char ixgb_copyright[] = "Copy static ixgb_vendor_info_t ixgb_vendor_info_array[] = { /* Intel(R) PRO/10000 Network Connection */ - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX, PCI_ANY_ID, PCI_ANY_ID, 0}, - {INTEL_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, PCI_ANY_ID, PCI_ANY_ID, 0}, + {IXGB_VENDOR_ID, IXGB_DEVICE_ID_82597EX, PCI_ANY_ID, PCI_ANY_ID, 0}, + {IXGB_VENDOR_ID, IXGB_DEVICE_ID_82597EX_SR, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ {0, 0, 0, 0, 0} }; Modified: stable/9/sys/dev/ixgb/ixgb_ids.h ============================================================================== --- stable/9/sys/dev/ixgb/ixgb_ids.h Wed Mar 5 19:45:21 2014 (r262802) +++ stable/9/sys/dev/ixgb/ixgb_ids.h Wed Mar 5 19:48:47 2014 (r262803) @@ -37,13 +37,9 @@ #define _IXGB_IDS_H_ /********************************************************************** -** The Device and Vendor IDs for 10 Gigabit MACs +** The Device IDs for 10 Gigabit MACs **********************************************************************/ -#define INTEL_VENDOR_ID 0x8086 -#define INTEL_SUBVENDOR_ID 0x8086 - - #define IXGB_DEVICE_ID_82597EX 0x1048 /* Cibolo A1, -LR (1310nm) */ #define IXGB_DEVICE_ID_82597EX_SR 0x1A48 /* Cibolo B0, -SR (850nm) */