benet: remove bogus "unlikely" on vlan check

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Jiri Pirko and committed by

David S. Miller 14 years ago 343e43c0 3c9c36bc

+2 -2

1 changed file

expand all

drivers

net

ethernet

emulex

benet

be_main.c

+2 -2

drivers/net/ethernet/emulex/benet/be_main.c

··· 1139 1139 skb->rxhash = rxcp->rss_hash; 1140 1140 1141 1141 1142 - if (unlikely(rxcp->vlanf)) 1142 + if (rxcp->vlanf) 1143 1143 __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag); 1144 1144 1145 1145 netif_receive_skb(skb); ··· 1196 1196 if (adapter->netdev->features & NETIF_F_RXHASH) 1197 1197 skb->rxhash = rxcp->rss_hash; 1198 1198 1199 - if (unlikely(rxcp->vlanf)) 1199 + if (rxcp->vlanf) 1200 1200 __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag); 1201 1201 1202 1202 napi_gro_frags(&eq_obj->napi);