aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2010-12-09 04:50:22 +0000
committerDavid S. Miller <davem@davemloft.net>2010-12-10 14:57:34 -0800
commit0e51d67ebb8e109a0990a13dafa937fb469aa3fb (patch)
treeb3d34c5d505a3c6f5b447c7bbe8fd5ee185fbb0d /drivers
parentxfrm: Traffic Flow Confidentiality for IPv6 ESP (diff)
downloadlinux-dev-0e51d67ebb8e109a0990a13dafa937fb469aa3fb.tar.xz
linux-dev-0e51d67ebb8e109a0990a13dafa937fb469aa3fb.zip
stmmac: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/stmmac/stmmac_main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c
index c0dc78571c62..20f803df8681 100644
--- a/drivers/net/stmmac/stmmac_main.c
+++ b/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 {