be2net: remove unnecessary usage of unlikely()
authorSathya Perla <sathya.perla@emulex.com>
Tue, 5 Jun 2012 19:37:21 +0000 (19:37 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Jun 2012 16:06:18 +0000 (09:06 -0700)
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/emulex/benet/be_main.c

index 3aa478f5035807a044a59e7e4f6437eb94f93cca..42ee75b794b612936d11780087d3e6c86e72d6a9 100644 (file)
@@ -719,8 +719,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;