From owner-svn-src-user@FreeBSD.ORG  Tue Feb  2 10:57:13 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 5F9171065692;
	Tue,  2 Feb 2010 10:57:13 +0000 (UTC)
	(envelope-from luigi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F1EB8FC17;
	Tue,  2 Feb 2010 10:57:13 +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 o12AvDhT058420;
	Tue, 2 Feb 2010 10:57:13 GMT (envelope-from luigi@svn.freebsd.org)
Received: (from luigi@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o12AvDEL058418;
	Tue, 2 Feb 2010 10:57:13 GMT (envelope-from luigi@svn.freebsd.org)
Message-Id: <201002021057.o12AvDEL058418@svn.freebsd.org>
From: Luigi Rizzo <luigi@FreeBSD.org>
Date: Tue, 2 Feb 2010 10:57:13 +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: r203374 - user/luigi/ipfw3-head/sys/netinet/ipfw
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Feb 2010 10:57:13 -0000

Author: luigi
Date: Tue Feb  2 10:57:13 2010
New Revision: 203374
URL: http://svn.freebsd.org/changeset/base/203374

Log:
  remove unnecessary casts and bcopy

Modified:
  user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw2.c

Modified: user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw2.c
==============================================================================
--- user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw2.c	Tue Feb  2 10:42:15 2010	(r203373)
+++ user/luigi/ipfw3-head/sys/netinet/ipfw/ip_fw2.c	Tue Feb  2 10:57:13 2010	(r203374)
@@ -1065,8 +1065,8 @@ do {								\
 		}
 		ip = mtod(m, struct ip *);
 		ip6 = (struct ip6_hdr *)ip;
-		bcopy(&ip6->ip6_src, &args->f_id.src_ip6, sizeof(ip6->ip6_src));
-		bcopy(&ip6->ip6_dst, &args->f_id.dst_ip6, sizeof(ip6->ip6_dst));
+		args->f_id.src_ip6 = ip6->ip6_src;
+		args->f_id.dst_ip6 = ip6->ip6_dst;
 		args->f_id.src_ip = 0;
 		args->f_id.dst_ip = 0;
 		args->f_id.flow_id6 = ntohl(ip6->ip6_flow);
@@ -1692,11 +1692,11 @@ do {								\
 				break;
 
 			case O_IP6_SRC_ME:
-				match= is_ipv6 && search_ip6_addr_net((struct in6_addr *)&args->f_id.src_ip6);
+				match= is_ipv6 && search_ip6_addr_net(&args->f_id.src_ip6);
 				break;
 
 			case O_IP6_DST_ME:
-				match= is_ipv6 && search_ip6_addr_net((struct in6_addr *)&args->f_id.dst_ip6);
+				match= is_ipv6 && search_ip6_addr_net(&args->f_id.dst_ip6);
 				break;
 
 			case O_FLOW6ID: