svn commit: r236406 - head/sys/dev/e1000

[John Baldwin]

Author: jhb
Date: Fri Jun  1 15:52:41 2012
New Revision: 236406
URL: http://svn.freebsd.org/changeset/base/236406

Log:
  Commit a portion of 233708 I missed earlier and don't include the
  definition of igb_start() and igb_start_locked() (nor set if_start in
  the ifnet) when igb(4) uses if_transmit.

Modified:
  head/sys/dev/e1000/if_igb.c

Modified: head/sys/dev/e1000/if_igb.c
==============================================================================
--- head/sys/dev/e1000/if_igb.c	Fri Jun  1 15:48:24 2012	(r236405)
+++ head/sys/dev/e1000/if_igb.c	Fri Jun  1 15:52:41 2012	(r236406)
@@ -846,6 +846,8 @@ igb_resume(device_t dev)
 }
 
 
+#if __FreeBSD_version < 800000
+
 /*********************************************************************
  *  Transmit entry point
  *
@@ -922,7 +924,7 @@ igb_start(struct ifnet *ifp)
 	return;
 }
 
-#if __FreeBSD_version >= 800000
+#else
 /*
 ** Multiqueue Transmit driver
 **
@@ -3010,14 +3012,15 @@ igb_setup_interface(device_t dev, struct
 	ifp->if_softc = adapter;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_ioctl = igb_ioctl;
-	ifp->if_start = igb_start;
 #if __FreeBSD_version >= 800000
 	ifp->if_transmit = igb_mq_start;
 	ifp->if_qflush = igb_qflush;
-#endif
+#else
+	ifp->if_start = igb_start;
 	IFQ_SET_MAXLEN(&ifp->if_snd, adapter->num_tx_desc - 1);
 	ifp->if_snd.ifq_drv_maxlen = adapter->num_tx_desc - 1;
 	IFQ_SET_READY(&ifp->if_snd);
+#endif
 
 	ether_ifattach(ifp, adapter->hw.mac.addr);