From 228907a12c989c238f623f57d70741d788b17c38 Mon Sep 17 00:00:00 2001
From: Tobias Klauser <tklauser@distanz.ch>
Date: Thu, 9 Dec 2010 04:50:22 +0000
Subject: [PATCH] --- yaml --- r: 224971 b: refs/heads/master c:
 0e51d67ebb8e109a0990a13dafa937fb469aa3fb h: refs/heads/master i:   224969:
 1ed71e5c58d2e405733b826627999c19a67f9b97   224967:
 7fc4e822b55f548c477ff975c5d20230b5b5a186 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/net/stmmac/stmmac_main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index be1a7a54cfcb..d788910306e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 040253c931e336360453c8d81f76d1b010b2b5e7
+refs/heads/master: 0e51d67ebb8e109a0990a13dafa937fb469aa3fb
diff --git a/trunk/drivers/net/stmmac/stmmac_main.c b/trunk/drivers/net/stmmac/stmmac_main.c
index c0dc78571c62..20f803df8681 100644
--- a/trunk/drivers/net/stmmac/stmmac_main.c
+++ b/trunk/drivers/net/stmmac/stmmac_main.c
@@ -949,7 +949,7 @@ static int stmmac_sw_tso(struct stmmac_priv *priv, struct sk_buff *skb)
 	       skb, skb->len);
 
 	segs = skb_gso_segment(skb, priv->dev->features & ~NETIF_F_TSO);
-	if (unlikely(IS_ERR(segs)))
+	if (IS_ERR(segs))
 		goto sw_tso_end;
 
 	do {