diff options
author | jfv <jfv@FreeBSD.org> | 2012-07-05 23:36:17 +0000 |
---|---|---|
committer | jfv <jfv@FreeBSD.org> | 2012-07-05 23:36:17 +0000 |
commit | ec9249e5d2ab05ab78279105bdaddcc45c74435f (patch) | |
tree | 8f0ebb96c1cb62b6e95d37a70e9d03e80eb72434 | |
parent | 8f97f54d9e4959f9908ed30f6d8db637469e74e8 (diff) | |
download | FreeBSD-src-ec9249e5d2ab05ab78279105bdaddcc45c74435f.zip FreeBSD-src-ec9249e5d2ab05ab78279105bdaddcc45c74435f.tar.gz |
Correct small regressions pointed out by jhb, thanks John.
MFC after:5 days
-rw-r--r-- | sys/dev/e1000/if_igb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/dev/e1000/if_igb.c b/sys/dev/e1000/if_igb.c index 0db4a49..204a62c 100644 --- a/sys/dev/e1000/if_igb.c +++ b/sys/dev/e1000/if_igb.c @@ -767,8 +767,6 @@ igb_detach(device_t dev) if (adapter->vlan_detach != NULL) EVENTHANDLER_DEREGISTER(vlan_unconfig, adapter->vlan_detach); - ether_ifdetach(adapter->ifp); - callout_drain(&adapter->timer); #ifdef DEV_NETMAP @@ -965,7 +963,7 @@ igb_mq_start(struct ifnet *ifp, struct mbuf *m) IGB_TX_UNLOCK(txr); } else { err = drbr_enqueue(ifp, txr->br, m); - taskqueue_enqueue(que->tq, &que->que_task); + taskqueue_enqueue(que->tq, &txr->txq_task); } return (err); |