diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-08-25 02:50:51 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-28 17:15:26 -0400 |
| commit | 343e43c02850a3abcd22bd144e5bdbc92fdd273c (patch) | |
| tree | a0fe72025375100fa2b07d7bbb335bee5813b7f0 | |
| parent | 3c9c36bcedd426f2be2826da43e5163de61735f7 (diff) | |
| download | linux-343e43c02850a3abcd22bd144e5bdbc92fdd273c.tar.bz2 | |
benet: remove bogus "unlikely" on vlan check
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>
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index fb2eda08a094..3d55b4767ae4 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/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); |