From 71e7047afe8d9e42c76c6fd5172d2b62e25fd8f6 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Thu, 23 Mar 2006 01:17:25 -0800
Subject: [PATCH] --- yaml --- r: 23173 b: refs/heads/master c:
 b30bd282cbf5c46247a279a2e8d2aae027d9f1bf h: refs/heads/master i:   23171:
 7445a8017c42c5750180b9b7a352e9fcad173684 v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/ip6_output.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f8ce0bd17af7..5f0f71e7c637 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ae39a430b692552e5aceb63fa35ce95fcbadc6a
+refs/heads/master: b30bd282cbf5c46247a279a2e8d2aae027d9f1bf
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
index 4fbc40b13f19..e46048974f37 100644
--- a/trunk/net/ipv6/ip6_output.c
+++ b/trunk/net/ipv6/ip6_output.c
@@ -161,7 +161,7 @@ int ip6_output(struct sk_buff *skb)
 int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
 	     struct ipv6_txoptions *opt, int ipfragok)
 {
-	struct ipv6_pinfo *np = sk ? inet6_sk(sk) : NULL;
+	struct ipv6_pinfo *np = inet6_sk(sk);
 	struct in6_addr *first_hop = &fl->fl6_dst;
 	struct dst_entry *dst = skb->dst;
 	struct ipv6hdr *hdr;