projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3c9c36b
)
benet: remove bogus "unlikely" on vlan check
author
Jiri Pirko
<
[email protected]
>
Thu, 25 Aug 2011 02:50:51 +0000
(
02:50
+0000)
committer
David S. Miller
<
[email protected]
>
Sun, 28 Aug 2011 21:15:26 +0000
(17:15 -0400)
Use of unlikely in this place is wrong. Remove it.
Signed-off-by: Jiri Pirko <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
drivers/net/ethernet/emulex/benet/be_main.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/emulex/benet/be_main.c
b/drivers/net/ethernet/emulex/benet/be_main.c
index fb2eda08a094841ee06757991f44b459e9125959..3d55b4767ae4fb2947854c260c72caff3acb27fa 100644
(file)
--- 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);