From owner-svn-src-user@FreeBSD.ORG Fri Nov 28 17:17:55 2008 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3844D1065673; Fri, 28 Nov 2008 17:17:55 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A6138FC0A; Fri, 28 Nov 2008 17:17:55 +0000 (UTC) (envelope-from dfr@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mASHHtbI024995; Fri, 28 Nov 2008 17:17:55 GMT (envelope-from dfr@svn.freebsd.org) Received: (from dfr@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id mASHHt31024994; Fri, 28 Nov 2008 17:17:55 GMT (envelope-from dfr@svn.freebsd.org) Message-Id: <200811281717.mASHHt31024994@svn.freebsd.org> From: Doug Rabson Date: Fri, 28 Nov 2008 17:17:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r185399 - user/dfr/xenhvm/6/sys/dev/xen/netfront X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 28 Nov 2008 17:17:55 -0000 Author: dfr Date: Fri Nov 28 17:17:54 2008 New Revision: 185399 URL: http://svn.freebsd.org/changeset/base/185399 Log: Suppress debug printfs. Make this build on amd64 and set the IFF_MULTICAST flag which is required for IPv6. Modified: user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Modified: user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c ============================================================================== --- user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Fri Nov 28 17:00:19 2008 (r185398) +++ user/dfr/xenhvm/6/sys/dev/xen/netfront/netfront.c Fri Nov 28 17:17:54 2008 (r185399) @@ -66,6 +66,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -327,9 +328,12 @@ xennet_get_rx_ref(struct netfront_info * printf("[XEN] " fmt, ##args) #define WPRINTK(fmt, args...) \ printf("[XEN] " fmt, ##args) +#if 0 #define DPRINTK(fmt, args...) \ printf("[XEN] " fmt, ##args) - +#else +#define DPRINTK(fmt, args...) +#endif static __inline struct mbuf* makembuf (struct mbuf *buf) @@ -395,8 +399,6 @@ netfront_probe(struct xenbus_device *dev struct ifnet *ifp; struct netfront_info *info; - printf("netfront_probe() \n"); - err = create_netdev(dev, &ifp); if (err) { xenbus_dev_fatal(dev, err, "creating netdev"); @@ -1215,7 +1217,7 @@ xennet_get_responses(struct netfront_inf MULTI_update_va_mapping(mcl, (u_long)vaddr, (((vm_paddr_t)mfn) << PAGE_SHIFT) | PG_RW | PG_V | PG_M | PG_A, 0); - pfn = (uint32_t)m->m_ext.ext_args; + pfn = (uintptr_t)m->m_ext.ext_args; mmu->ptr = ((vm_paddr_t)mfn << PAGE_SHIFT) | MMU_MACHPHYS_UPDATE; mmu->val = pfn; @@ -1549,8 +1551,6 @@ network_connect(struct ifnet *ifp) netif_rx_request_t *req; u_int feature_rx_copy, feature_rx_flip; - printf("network_connect\n"); - np = ifp->if_softc; err = xenbus_scanf(XBT_NIL, np->xbdev->otherend, "feature-rx-copy", "%u", &feature_rx_copy); @@ -1704,7 +1704,7 @@ create_netdev(struct xenbus_device *dev, *ifpp = ifp = np->xn_ifp = if_alloc(IFT_ETHER); ifp->if_softc = np; if_initname(ifp, "xn", ifno++/* ifno */); - ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX; + ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST; ifp->if_ioctl = xn_ioctl; ifp->if_output = ether_output; ifp->if_start = xn_start; @@ -1831,7 +1831,7 @@ netif_init(void *unused) if (is_initial_xendomain()) return; - IPRINTK("Initialising virtual ethernet driver.\n"); + DPRINTK("Initialising virtual ethernet driver.\n"); xenbus_register_frontend(&netfront); }