---

yaml --- r: 194618 b: refs/heads/master c: 83d7eb2 h: refs/heads/master v: v3
git-mirror · Apr 30, 2010 · 3117a8c · 3117a8c
1 parent 297347d
commit 3117a8c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b021628beb26238087812829cc080da47e4b236
+refs/heads/master: 83d7eb2979cd3390c375470225dd2d8f2009bc70
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
@@ -218,8 +218,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
 			}
 			kfree_skb(skb);
 			skb = skb2;
-			if (sk)
-				skb_set_owner_w(skb, sk);
+			skb_set_owner_w(skb, sk);
 		}
 		if (opt->opt_flen)
 			ipv6_push_frag_opts(skb, opt, &proto);