---

yaml --- r: 314691 b: refs/heads/master c: 1d1e34d h: refs/heads/master i: 314689: 7f92db1 314687: 4f1be06 v: v3
git-mirror · Jun 28, 2012 · 86a210e · 86a210e
1 parent 5e47c78
commit 86a210e
Show file tree

Hide file tree

Showing 3 changed files with 209 additions and 197 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 160c85f0e050d92c0e42321aab2ffc343594e1c0
+refs/heads/master: 1d1e34ddd48d27def2f324c1e3be16d460b16436
diff --git a/trunk/include/net/xfrm.h b/trunk/include/net/xfrm.h
@@ -1682,13 +1682,11 @@ static inline int xfrm_mark_get(struct nlattr **attrs, struct xfrm_mark *m)
 
 static inline int xfrm_mark_put(struct sk_buff *skb, const struct xfrm_mark *m)
 {
-	if ((m->m | m->v) &&
-	    nla_put(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m))
-		goto nla_put_failure;
-	return 0;
+	int ret = 0;
 
-nla_put_failure:
-	return -1;
+	if (m->m | m->v)
+		ret = nla_put(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m);
+	return ret;
 }
 
 #endif	/* _NET_XFRM_H */