From owner-svn-src-head@FreeBSD.ORG Thu Nov 19 20:59:41 2009 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C095106566B; Thu, 19 Nov 2009 20:59:41 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A39D8FC14; Thu, 19 Nov 2009 20:59:41 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAJKxeHS019169; Thu, 19 Nov 2009 20:59:40 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAJKxegM019167; Thu, 19 Nov 2009 20:59:40 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <200911192059.nAJKxegM019167@svn.freebsd.org> From: John Baldwin Date: Thu, 19 Nov 2009 20:59:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199549 - head/sys/dev/xen/netfront X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 19 Nov 2009 20:59:41 -0000 Author: jhb Date: Thu Nov 19 20:59:40 2009 New Revision: 199549 URL: http://svn.freebsd.org/changeset/base/199549 Log: Remove commented out reference to if_watchdog and an assignment of zero to if_timer. Reviewed by: scottl Modified: head/sys/dev/xen/netfront/netfront.c Modified: head/sys/dev/xen/netfront/netfront.c ============================================================================== --- head/sys/dev/xen/netfront/netfront.c Thu Nov 19 20:57:35 2009 (r199548) +++ head/sys/dev/xen/netfront/netfront.c Thu Nov 19 20:59:40 2009 (r199549) @@ -1056,7 +1056,6 @@ xn_txeof(struct netfront_info *np) return; ifp = np->xn_ifp; - ifp->if_timer = 0; do { prod = np->tx.sring->rsp_prod; @@ -1948,9 +1947,6 @@ create_netdev(device_t dev) ifp->if_ioctl = xn_ioctl; ifp->if_output = ether_output; ifp->if_start = xn_start; -#ifdef notyet - ifp->if_watchdog = xn_watchdog; -#endif ifp->if_init = xn_ifinit; ifp->if_mtu = ETHERMTU; ifp->if_snd.ifq_maxlen = NET_TX_RING_SIZE - 1;