From: Jiri Pirko Date: Thu, 25 Aug 2011 02:50:51 +0000 (+0000) Subject: benet: remove bogus "unlikely" on vlan check X-Git-Tag: v2.6.39-400.9.0~821^2~33 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0c5123fa98850027cd7cdaaf2d3f9958d4250a00;p=users%2Fjedix%2Flinux-maple.git benet: remove bogus "unlikely" on vlan check Use of unlikely in this place is wrong. Remove it. Signed-off-by: Jiri Pirko Signed-off-by: David S. Miller --- diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index fb2eda08a094..3d55b4767ae4 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -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);