From owner-svn-src-all@FreeBSD.ORG Thu Jul 5 21:32:26 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C4EA6106566B; Thu, 5 Jul 2012 21:32:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from bigwig.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id 99C808FC15; Thu, 5 Jul 2012 21:32:26 +0000 (UTC) Received: from jhbbsd.localnet (unknown [209.249.190.124]) by bigwig.baldwin.cx (Postfix) with ESMTPSA id F1279B95A; Thu, 5 Jul 2012 17:32:25 -0400 (EDT) From: John Baldwin To: Jack F Vogel Date: Thu, 5 Jul 2012 17:25:48 -0400 User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p17; KDE/4.5.5; amd64; ; ) References: <201207052026.q65KQw9m016770@svn.freebsd.org> In-Reply-To: <201207052026.q65KQw9m016770@svn.freebsd.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201207051725.48614.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (bigwig.baldwin.cx); Thu, 05 Jul 2012 17:32:26 -0400 (EDT) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r238148 - in head/sys: conf dev/e1000 modules/igb X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2012 21:32:26 -0000 On Thursday, July 05, 2012 4:26:58 pm Jack F Vogel wrote: > Author: jfv > Date: Thu Jul 5 20:26:57 2012 > New Revision: 238148 > URL: http://svn.freebsd.org/changeset/base/238148 > > Log: > Sync with Intel internal source: > shared code update and small changes in core required > Add support for new i210/i211 devices > Improve queue calculation based on mac type > > MFC after:5 days I only spot two small regressions in this merge: Index: if_igb.c =================================================================== --- if_igb.c (revision 238148) +++ if_igb.c (working copy) @@ -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); (The current driver calls ether_ifdetach() twice, and the second change refixes the issue with packets being delivered out-of-order.) However, the changes to add a (int *)cast to eee_disable are not safe. You will need to add some sort of SYSCTL_PROC wrapper that sets the boolean directly instead. I don't think it is safe to rely on bool being an int. -- John Baldwin