Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 352515
b: refs/heads/master
c: 0d4bfa2
h: refs/heads/master
i:
  352513: 1f7a41e
  352511: b38dfb9
v: v3
  • Loading branch information
stephen hemminger authored and David S. Miller committed Feb 18, 2013
1 parent d467fc7 commit e6bb653
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: 2f219d5fb1184bda8398e5ab9fb2910a202e2c94
refs/heads/master: 0d4bfa297c3f7efb71367449ee44f9d3fb0f5871
3 changes: 2 additions & 1 deletion trunk/net/ipv6/xfrm6_mode_tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,8 @@ static int xfrm6_mode_tunnel_input(struct xfrm_state *x, struct sk_buff *skb)
if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
goto out;

if (err = skb_unclone(skb, GFP_ATOMIC))
err = skb_unclone(skb, GFP_ATOMIC);
if (err)
goto out;

if (x->props.flags & XFRM_STATE_DECAP_DSCP)
Expand Down

0 comments on commit e6bb653

Please sign in to comment.