Date: Thu, 5 Jul 2012 23:36:18 +0000 (UTC) From: Jack F Vogel <jfv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r238151 - head/sys/dev/e1000 Message-ID: <201207052336.q65NaIrb026089@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jfv Date: Thu Jul 5 23:36:17 2012 New Revision: 238151 URL: http://svn.freebsd.org/changeset/base/238151 Log: Correct small regressions pointed out by jhb, thanks John. MFC after:5 days Modified: head/sys/dev/e1000/if_igb.c Modified: head/sys/dev/e1000/if_igb.c ============================================================================== --- head/sys/dev/e1000/if_igb.c Thu Jul 5 21:11:03 2012 (r238150) +++ head/sys/dev/e1000/if_igb.c Thu Jul 5 23:36:17 2012 (r238151) @@ -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 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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207052336.q65NaIrb026089>