From owner-svn-src-all@FreeBSD.ORG Wed Aug 4 15:59:46 2010 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 75C40106564A; Wed, 4 Aug 2010 15:59:46 +0000 (UTC) (envelope-from gnn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 48D208FC27; Wed, 4 Aug 2010 15:59:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o74Fxktg016422; Wed, 4 Aug 2010 15:59:46 GMT (envelope-from gnn@svn.freebsd.org) Received: (from gnn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o74FxkLh016419; Wed, 4 Aug 2010 15:59:46 GMT (envelope-from gnn@svn.freebsd.org) Message-Id: <201008041559.o74FxkLh016419@svn.freebsd.org> From: "George V. Neville-Neil" Date: Wed, 4 Aug 2010 15:59:46 +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: r210850 - in stable/7/sys: conf dev/e1000 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: Wed, 04 Aug 2010 15:59:46 -0000 Author: gnn Date: Wed Aug 4 15:59:45 2010 New Revision: 210850 URL: http://svn.freebsd.org/changeset/base/210850 Log: Fix a build breakage foudn by the module build in tinderbox. Update NOTES so that em and igb are both now part of the LINT kernel. Pointed out by: tinderbox Modified: stable/7/sys/conf/NOTES stable/7/sys/dev/e1000/if_igb.c Modified: stable/7/sys/conf/NOTES ============================================================================== --- stable/7/sys/conf/NOTES Wed Aug 4 14:58:59 2010 (r210849) +++ stable/7/sys/conf/NOTES Wed Aug 4 15:59:45 2010 (r210850) @@ -1754,6 +1754,7 @@ device miibus # KNE110TX. # de: Digital Equipment DC21040 # em: Intel Pro/1000 Gigabit Ethernet 82542, 82543, 82544 based adapters. +# igb: Intel Pro/1000 PCI Express Gigabit Ethernet: 82575 and later adapters. # ep: 3Com 3C509, 3C529, 3C556, 3C562D, 3C563D, 3C572, 3C574X, 3C579, 3C589 # and PC Card devices using these chipsets. # ex: Intel EtherExpress Pro/10 and other i82595-based adapters, @@ -1913,6 +1914,8 @@ device xl # 3Com 3c90x (``Boomerang'', # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') +device em # Intel Pro/1000 Gigabit Ethernet +device igb # Intel Pro/1000 PCIE Gigabit Ethernet device le # AMD Am7900 LANCE and Am79C9xx PCnet device mxge # Myricom Myri-10G 10GbE NIC device nxge # Neterion Xframe 10GbE Server/Storage Adapter Modified: stable/7/sys/dev/e1000/if_igb.c ============================================================================== --- stable/7/sys/dev/e1000/if_igb.c Wed Aug 4 14:58:59 2010 (r210849) +++ stable/7/sys/dev/e1000/if_igb.c Wed Aug 4 15:59:45 2010 (r210850) @@ -1916,7 +1916,7 @@ igb_local_timer(void *arg) /* Trigger an RX interrupt on all queues */ #ifdef DEVICE_POLLING - if (!(ifp->if_capenable & IFCAP_POLLING)) + if (!(adapter->ifp->if_capenable & IFCAP_POLLING)) #endif E1000_WRITE_REG(&adapter->hw, E1000_EICS, adapter->rx_mask); callout_reset(&adapter->timer, hz, igb_local_timer, adapter);