svn commit: r203374 - user/luigi/ipfw3-head/sys/netinet/ipfw

[Luigi Rizzo]

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: