diff -cNr nfo-2.6.2_orig/gem.c nfo-2.6.2_snv_105/gem.c
*** nfo-2.6.2_orig/gem.c	2008-11-28 20:57:02.000000000 +0900
--- nfo-2.6.2_snv_105/gem.c	2008-12-18 16:12:00.437860966 +0900
***************
*** 5883,5889 ****
  static void		gem_m_ioctl(void *, queue_t *, mblk_t *);
  static boolean_t	gem_m_getcapab(void *, mac_capab_t, void *);
  
! #define	GEM_M_CALLBACK_FLAGS	(MC_RESOURCES | MC_IOCTL | MC_GETCAPAB)
  
  static mac_callbacks_t gem_m_callbacks = {
  	GEM_M_CALLBACK_FLAGS,
--- 5883,5889 ----
  static void		gem_m_ioctl(void *, queue_t *, mblk_t *);
  static boolean_t	gem_m_getcapab(void *, mac_capab_t, void *);
  
! #define	GEM_M_CALLBACK_FLAGS	( MC_IOCTL | MC_GETCAPAB)
  
  static mac_callbacks_t gem_m_callbacks = {
  	GEM_M_CALLBACK_FLAGS,
***************
*** 5894,5900 ****
  	gem_m_multicst,
  	gem_m_unicst,
  	gem_m_tx,
- 	gem_m_resources,
  	gem_m_ioctl,
  	gem_m_getcapab,
  };
--- 5894,5899 ----
***************
*** 6443,6475 ****
  }
  
  static void
- gem_m_resources(void *arg)
- {
- 	struct gem_dev		*dp = arg;
- 	mac_rx_fifo_t		mrf;
- 
- 	DPRINTF(0, (CE_CONT, "!%s: %s: called", dp->name, __func__));
- 
- 	mutex_enter(&dp->intrlock);
- 	mutex_enter(&dp->xmitlock);
- 
- 	/*
- 	 * Register Rx rings as resources and save mac
- 	 * resource id for future reference
- 	 */
- 	mrf.mrf_type = MAC_RX_FIFO;
- 	mrf.mrf_blank = gem_set_coalease;
- 	mrf.mrf_arg = (void *)dp;
- 	mrf.mrf_normal_blank_time = 1; /* in uS */
- 	mrf.mrf_normal_pkt_count = dp->poll_pkt_delay;
- 
- 	dp->mac_rx_ring_ha = mac_resource_add(dp->mh, (mac_resource_t *)&mrf);
- 
- 	mutex_exit(&dp->xmitlock);
- 	mutex_exit(&dp->intrlock);
- }
- 
- static void
  gem_m_ioctl(void *arg, queue_t *wq, mblk_t *mp)
  {
  	DPRINTF(1, (CE_CONT, "!%s: %s: called",
--- 6442,6447 ----
***************
*** 6522,6530 ****
--- 6494,6504 ----
  		break;
  
  #endif /* GEM_CONFIG_CKSUM_OFFLOAD */
+ /*
  	case MAC_CAPAB_POLL:
  		ret = B_TRUE;
  		break;
+ */
  	}
  	return (ret);
  }
diff -cNr nfo-2.6.2_orig/gem.h nfo-2.6.2_snv_105/gem.h
*** nfo-2.6.2_orig/gem.h	2008-11-28 20:57:02.000000000 +0900
--- nfo-2.6.2_snv_105/gem.h	2008-12-18 15:42:10.347861430 +0900
***************
*** 37,42 ****
--- 37,43 ----
  #ifdef GEM_CONFIG_GLDv3
  #include <sys/mac.h>
  #include <sys/mac_ether.h>
+ #include <sys/mac_provider.h>
  #else
  #include <sys/gld.h>
  #endif /* GLDv3 */
***************
*** 712,718 ****
  #else
  #define	GEM_STREAM_OPS(dev_ops, attach, detach)	\
  	DDI_DEFINE_STREAM_OPS(dev_ops, nulldev, nulldev, attach, detach, \
! 	nodev, NULL, D_MP, NULL, gem_quiscence)
  #endif
  #else
  #define	gem_getinfo	gld_getinfo
--- 713,719 ----
  #else
  #define	GEM_STREAM_OPS(dev_ops, attach, detach)	\
  	DDI_DEFINE_STREAM_OPS(dev_ops, nulldev, nulldev, attach, detach, \
! 	nodev, NULL, D_MP, NULL, gem_quiesce)
  #endif
  #else
  #define	gem_getinfo	gld_getinfo