Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen

[~andy/linux] / include / net / xfrm.h

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 4de7ed9016d9f6bf231c838a2da5b4aa5b41c458..89174e29dca99bf943aed6d3ed6544fd040f002e 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1217,8 +1217,8 @@ void xfrm_flowi_addr_get(const struct flowi *fl,
                memcpy(&daddr->a4, &fl->u.ip4.daddr, sizeof(daddr->a4));
                break;
        case AF_INET6:
-               ipv6_addr_copy((struct in6_addr *)&saddr->a6, &fl->u.ip6.saddr);
-               ipv6_addr_copy((struct in6_addr *)&daddr->a6, &fl->u.ip6.daddr);
+               *(struct in6_addr *)saddr->a6 = fl->u.ip6.saddr;
+               *(struct in6_addr *)daddr->a6 = fl->u.ip6.daddr;
                break;
        }
 }