benet: remove bogus "unlikely" on vlan check
authorJiri Pirko <jpirko@redhat.com>
Thu, 25 Aug 2011 02:50:51 +0000 (02:50 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sun, 28 Aug 2011 21:15:26 +0000 (17:15 -0400)
Use of unlikely in this place is wrong. Remove it.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/emulex/benet/be_main.c

index fb2eda0..3d55b47 100644 (file)
@@ -1139,7 +1139,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
                skb->rxhash = rxcp->rss_hash;
 
 
-       if (unlikely(rxcp->vlanf))
+       if (rxcp->vlanf)
                __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag);
 
        netif_receive_skb(skb);
@@ -1196,7 +1196,7 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
        if (adapter->netdev->features & NETIF_F_RXHASH)
                skb->rxhash = rxcp->rss_hash;
 
-       if (unlikely(rxcp->vlanf))
+       if (rxcp->vlanf)
                __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag);
 
        napi_gro_frags(&eq_obj->napi);