From fa2c3b593b78a9f7f0fc5e7649badc04454a0de1 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 9 Dec 2010 04:37:48 +0000
Subject: [PATCH] --- yaml --- r: 224972 b: refs/heads/master c:
 376d940ee91318cc6becefbb9454bb4454d7473f h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d788910306e7..5572827eea86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e51d67ebb8e109a0990a13dafa937fb469aa3fb
+refs/heads/master: 376d940ee91318cc6becefbb9454bb4454d7473f
diff --git a/trunk/net/ipv6/af_inet6.c b/trunk/net/ipv6/af_inet6.c
index 54e8e42f7a88..059a3de647db 100644
--- a/trunk/net/ipv6/af_inet6.c
+++ b/trunk/net/ipv6/af_inet6.c
@@ -810,7 +810,7 @@ static struct sk_buff *ipv6_gso_segment(struct sk_buff *skb, int features)
 	}
 	rcu_read_unlock();
 
-	if (unlikely(IS_ERR(segs)))
+	if (IS_ERR(segs))
 		goto out;
 
 	for (skb = segs; skb; skb = skb->next) {