Skip to content

Commit

Permalink
benet: remove bogus "unlikely" on vlan check
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jiri Pirko authored and davem330 committed Aug 28, 2011
1 parent 3c9c36b commit 343e43c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/emulex/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 343e43c

Please sign in to comment.