aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJiri Pirko <jpirko@redhat.com>2011-08-24 22:50:51 -0400
committerDavid S. Miller <davem@davemloft.net>2011-08-28 17:15:26 -0400
commit343e43c02850a3abcd22bd144e5bdbc92fdd273c (patch)
treea0fe72025375100fa2b07d7bbb335bee5813b7f0 /drivers/net
parent3c9c36bcedd426f2be2826da43e5163de61735f7 (diff)
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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c4
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,
1139 skb->rxhash = rxcp->rss_hash; 1139 skb->rxhash = rxcp->rss_hash;
1140 1140
1141 1141
1142 if (unlikely(rxcp->vlanf)) 1142 if (rxcp->vlanf)
1143 __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag); 1143 __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag);
1144 1144
1145 netif_receive_skb(skb); 1145 netif_receive_skb(skb);
@@ -1196,7 +1196,7 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
1196 if (adapter->netdev->features & NETIF_F_RXHASH) 1196 if (adapter->netdev->features & NETIF_F_RXHASH)
1197 skb->rxhash = rxcp->rss_hash; 1197 skb->rxhash = rxcp->rss_hash;
1198 1198
1199 if (unlikely(rxcp->vlanf)) 1199 if (rxcp->vlanf)
1200 __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag); 1200 __vlan_hwaccel_put_tag(skb, rxcp->vlan_tag);
1201 1201
1202 napi_gro_frags(&eq_obj->napi); 1202 napi_gro_frags(&eq_obj->napi);