From owner-svn-src-user@FreeBSD.ORG Thu Nov 22 16:14:42 2012 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9CC555DB; Thu, 22 Nov 2012 16:14:42 +0000 (UTC) (envelope-from andre@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 69F4B8FC13; Thu, 22 Nov 2012 16:14:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAMGEgKN017864; Thu, 22 Nov 2012 16:14:42 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAMGEgaw017861; Thu, 22 Nov 2012 16:14:42 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201211221614.qAMGEgaw017861@svn.freebsd.org> From: Andre Oppermann Date: Thu, 22 Nov 2012 16:14:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r243407 - in user/andre/tcp_workqueue/sys: dev/mxge sys X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.14 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: Thu, 22 Nov 2012 16:14:42 -0000 Author: andre Date: Thu Nov 22 16:14:41 2012 New Revision: 243407 URL: http://svnweb.freebsd.org/changeset/base/243407 Log: Omit the type casting parameter from mtodo() and cast through void * which then can be assigned to any other pointer type without warning from the compiler. Suggested by: mdf Modified: user/andre/tcp_workqueue/sys/dev/mxge/if_mxge.c user/andre/tcp_workqueue/sys/sys/mbuf.h Modified: user/andre/tcp_workqueue/sys/dev/mxge/if_mxge.c ============================================================================== --- user/andre/tcp_workqueue/sys/dev/mxge/if_mxge.c Thu Nov 22 15:38:09 2012 (r243406) +++ user/andre/tcp_workqueue/sys/dev/mxge/if_mxge.c Thu Nov 22 16:14:41 2012 (r243407) @@ -2098,7 +2098,7 @@ mxge_encap(struct mxge_slice_state *ss, if (m->m_pkthdr.csum_flags & (CSUM_IP_UDP|CSUM_IP_TCP)) { /* ensure ip header is in first mbuf, copy it to a scratch buffer if not */ - ip = mtodo(m, ip_off, struct ip *); + ip = mtodo(m, ip_off); cksum_offset = ip_off + (ip->ip_hl << 2); pseudo_hdr_offset = cksum_offset + m->m_pkthdr.csum_l3hlen; pseudo_hdr_offset = htobe16(pseudo_hdr_offset); Modified: user/andre/tcp_workqueue/sys/sys/mbuf.h ============================================================================== --- user/andre/tcp_workqueue/sys/sys/mbuf.h Thu Nov 22 15:38:09 2012 (r243406) +++ user/andre/tcp_workqueue/sys/sys/mbuf.h Thu Nov 22 16:14:41 2012 (r243407) @@ -64,10 +64,10 @@ * type: * * mtod(m, t) -- Convert mbuf pointer to data pointer of correct type. - * mtodo(m, o, t) - Same as above but with offset 'o' into data. + * mtodo(m, o) -- Same as above but with offset 'o' into data. */ #define mtod(m, t) ((t)((m)->m_data)) -#define mtodo(m, o, t) ((t)(((m)->m_data) + (o))) +#define mtodo(m, o) ((void *)(((m)->m_data) + (o))) /* * Argument structure passed to UMA routines during mbuf and packet