Date: Fri, 27 Jul 2012 10:31:26 +0000 (UTC) From: Luigi Rizzo <luigi@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r238831 - head/sys/dev/netmap Message-ID: <201207271031.q6RAVQ0W094737@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: luigi Date: Fri Jul 27 10:31:26 2012 New Revision: 238831 URL: http://svn.freebsd.org/changeset/base/238831 Log: remove unused definition, whitespace cleanup Modified: head/sys/dev/netmap/netmap_kern.h Modified: head/sys/dev/netmap/netmap_kern.h ============================================================================== --- head/sys/dev/netmap/netmap_kern.h Fri Jul 27 10:06:47 2012 (r238830) +++ head/sys/dev/netmap/netmap_kern.h Fri Jul 27 10:31:26 2012 (r238831) @@ -62,9 +62,9 @@ * For the 32-bit value, 0x100000 (bit 20) has no clashes up to 3.3.1 */ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) -#define IFCAP_NETMAP 0x8000 +#define IFCAP_NETMAP 0x8000 #else -#define IFCAP_NETMAP 0x100000 +#define IFCAP_NETMAP 0x100000 #endif #elif defined (__APPLE__) @@ -94,9 +94,6 @@ MALLOC_DECLARE(M_NETMAP); __FUNCTION__, __LINE__, ##__VA_ARGS__); \ } while (0) -#ifndef IFF_NETMAP /* XXX is it really needed ? */ -#define IFF_NETMAP 0x20000 -#endif struct netmap_adapter; /* @@ -310,8 +307,8 @@ netmap_reload_map(bus_dma_tag_t tag, bus * XXX How do we redefine these functions: * * on linux we need - * dma_map_single(&pdev->dev, virt_addr, len, direction) - * dma_unmap_single(&adapter->pdev->dev, phys_addr, len, direction + * dma_map_single(&pdev->dev, virt_addr, len, direction) + * dma_unmap_single(&adapter->pdev->dev, phys_addr, len, direction * The len can be implicit (on netmap it is NETMAP_BUF_SIZE) * unfortunately the direction is not, so we need to change * something to have a cross API @@ -327,9 +324,9 @@ netmap_reload_map(bus_dma_tag_t tag, bus //buffer_info->next_to_watch = l; /* reload dma map */ dma_unmap_single(&adapter->pdev->dev, buffer_info->dma, - NETMAP_BUF_SIZE, DMA_TO_DEVICE); + NETMAP_BUF_SIZE, DMA_TO_DEVICE); buffer_info->dma = dma_map_single(&adapter->pdev->dev, - addr, NETMAP_BUF_SIZE, DMA_TO_DEVICE); + addr, NETMAP_BUF_SIZE, DMA_TO_DEVICE); if (dma_mapping_error(&adapter->pdev->dev, buffer_info->dma)) { D("dma mapping error");
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201207271031.q6RAVQ0W094737>