From 177266c0d1bff3d3966690b1151c55533a1f4229 Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Wed, 30 Jun 2010 10:41:15 -0700
Subject: [PATCH] --- yaml --- r: 200863 b: refs/heads/master c:
 4efd7e833591721bec21cc4730a7f6261417840f h: refs/heads/master i:   200861:
 ff831f426215dbe14c0d64ca35eb60671fdc3de0   200859:
 d6c79377bc75aefb063909798a6b034f2fb25663   200855:
 11ee90ac3cea660cb0fa241edb5dee76ccae4909   200847:
 c3ec3621cf00de44ba354a131633fec4eb49df69   200831:
 843e71efca88689d31237920816910a93d94ea34 v: v3

---
 [refs]                   | 2 +-
 trunk/include/net/xfrm.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 89ab3f5bd441..8d55900d4ea0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3ead2413cb99d3e6265577b12537434e229d8c2
+refs/heads/master: 4efd7e833591721bec21cc4730a7f6261417840f
diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h
index 1913af67c43d..fc8f36dd0f5c 100644
--- a/trunk/include/net/xfrm.h
+++ b/trunk/include/net/xfrm.h
@@ -1586,7 +1586,7 @@ static inline struct xfrm_state *xfrm_input_state(struct sk_buff *skb)
 static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m)
 {
 	if (attrs[XFRMA_MARK])
-		memcpy(m, nla_data(attrs[XFRMA_MARK]), sizeof(m));
+		memcpy(m, nla_data(attrs[XFRMA_MARK]), sizeof(struct xfrm_mark));
 	else
 		m->v = m->m = 0;