diff options
author | John Baldwin <jhb@FreeBSD.org> | 2012-06-01 15:52:41 +0000 |
---|---|---|
committer | John Baldwin <jhb@FreeBSD.org> | 2012-06-01 15:52:41 +0000 |
commit | 03b0ca8b28a91533f7309e2415c0646ad4adee5f (patch) | |
tree | 9f2e835860c017e4d34b3c77d62aba95b061bdb5 /sys | |
parent | 370b70dc03c8a5e5155ae5a7a08093785d6a7d8b (diff) | |
download | src-03b0ca8b28a91533f7309e2415c0646ad4adee5f.tar.gz src-03b0ca8b28a91533f7309e2415c0646ad4adee5f.zip |
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.
Notes
Notes:
svn path=/head/; revision=236406
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/e1000/if_igb.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c index 68997f9f07fc..cb6c63fdd67c 100644 --- a/sys/dev/e1000/if_igb.c +++ b/sys/dev/e1000/if_igb.c @@ -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 adapter *adapter) 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); |