]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
be2net: remove unnecessary usage of unlikely()
authorSathya Perla <sathya.perla@emulex.com>
Tue, 5 Jun 2012 19:37:21 +0000 (19:37 +0000)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Mon, 27 Aug 2012 14:06:28 +0000 (07:06 -0700)
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/benet/be_main.c

index 0801fe57ec7de80d2682bf8001c295e9834da292..d4907d7a9fc42a9c4a4ebfb13a8bc597449235e1 100644 (file)
@@ -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;