Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 300425
b: refs/heads/master
c: e545d71
h: refs/heads/master
i:
  300423: 533e75d
v: v3
  • Loading branch information
David S. Miller committed Apr 2, 2012
1 parent bb9cf31 commit 7134b9b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9d83ba4b6c6625de038f03cee18dd7bd89cee69b
refs/heads/master: e545d71390b50a8dab75efb182a4adc3c2603962
5 changes: 3 additions & 2 deletions trunk/include/net/xfrm.h
Original file line number Diff line number Diff line change
Expand Up @@ -1682,8 +1682,9 @@ 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);
if ((m->m | m->v) &&
nla_put(skb, XFRMA_MARK, sizeof(struct xfrm_mark), m))
goto nla_put_failure;
return 0;

nla_put_failure:
Expand Down

0 comments on commit 7134b9b

Please sign in to comment.