From: Sathya Perla <sathya.perla@emulex.com>
Date: Tue, 5 Jun 2012 19:37:21 +0000 (+0000)
Subject: be2net: remove unnecessary usage of unlikely()
X-Git-Tag: v2.6.39-400.9.0~382
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ed6c6d3cbfee9dd971afbf28658889738b549904;p=users%2Fjedix%2Flinux-maple.git

be2net: remove unnecessary usage of unlikely()

Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 0801fe57ec7d..d4907d7a9fc4 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -718,8 +718,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb,
 	 * 60 bytes long.
 	 * As a workaround disable TX vlan offloading in such cases.
 	 */
-	if (unlikely(vlan_tx_tag_present(skb) &&
-		     (skb->ip_summed != CHECKSUM_PARTIAL || skb->len <= 60))) {
+	if (vlan_tx_tag_present(skb) &&
+	    (skb->ip_summed != CHECKSUM_PARTIAL || skb->len <= 60)) {
 		skb = skb_share_check(skb, GFP_ATOMIC);
 		if (unlikely(!skb))
 			goto tx_drop;