---

yaml --- r: 200863 b: refs/heads/master c: 4efd7e8 h: refs/heads/master i: 200861: ff831f4 200859: d6c7937 200855: 11ee90a 200847: c3ec362 200831: 843e71e v: v3
git-mirror · Jun 30, 2010 · 177266c · 177266c
1 parent f7f1add
commit 177266c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;