svn commit: r210850 - in stable/7/sys: conf dev/e1000

[George V. Neville-Neil]

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);