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;