* [patch net-next-2.6] benet: remove bogus "unlikely" on vlan check
@ 2011-08-25 12:50 Jiri Pirko
2011-08-28 21:14 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jiri Pirko @ 2011-08-25 12:50 UTC (permalink / raw)
To: netdev
Cc: davem, eric.dumazet, sathya.perla, subbu.seetharaman,
ajit.khaparde, ivecera
Use of unlikely in this place is wrong. Remove it.
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
---
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 fb2eda0..3d55b47 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);
--
1.7.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch net-next-2.6] benet: remove bogus "unlikely" on vlan check
2011-08-25 12:50 [patch net-next-2.6] benet: remove bogus "unlikely" on vlan check Jiri Pirko
@ 2011-08-28 21:14 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-08-28 21:14 UTC (permalink / raw)
To: jpirko
Cc: netdev, eric.dumazet, sathya.perla, subbu.seetharaman,
ajit.khaparde, ivecera
From: Jiri Pirko <jpirko@redhat.com>
Date: Thu, 25 Aug 2011 14:50:51 +0200
> Use of unlikely in this place is wrong. Remove it.
>
> Signed-off-by: Jiri Pirko <jpirko@redhat.com>
I'll apply this, thanks Jiri.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-08-28 21:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-25 12:50 [patch net-next-2.6] benet: remove bogus "unlikely" on vlan check Jiri Pirko
2011-08-28 21:14 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.