|
 |
4b0fbfc |
From 82f15998fafe683add83f7a11b2e25f919b3cd2d Mon Sep 17 00:00:00 2001
|
|
|
4b0fbfc |
From: Jiri Pirko <jpirko@redhat.com>
|
|
|
4b0fbfc |
Date: Tue, 25 Oct 2011 13:47:16 -0400
|
|
|
4b0fbfc |
Subject: [PATCH] benet: remove bogus "unlikely" on vlan check
|
|
|
4b0fbfc |
|
|
|
4b0fbfc |
Use of unlikely in this place is wrong. Remove it.
|
|
|
4b0fbfc |
|
|
|
4b0fbfc |
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
|
|
|
4b0fbfc |
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
|
4b0fbfc |
Backported-by: Josh Boyer <jwboyer@redhat.com>
|
|
|
4b0fbfc |
---
|
|
|
4b0fbfc |
drivers/net/benet/be_main.c | 4 ++--
|
|
|
4b0fbfc |
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
4b0fbfc |
|
|
|
4b0fbfc |
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
|
|
|
4b0fbfc |
index c411bb1..6df0c7e 100644
|
|
|
4b0fbfc |
--- a/drivers/net/benet/be_main.c
|
|
|
4b0fbfc |
+++ b/drivers/net/benet/be_main.c
|
|
|
4b0fbfc |
@@ -1192,7 +1192,7 @@ static void be_rx_compl_process(struct be_adapter *adapter,
|
|
|
4b0fbfc |
skb->rxhash = rxcp->rss_hash;
|
|
|
4b0fbfc |
|
|
|
4b0fbfc |
|
|
|
4b0fbfc |
- if (unlikely(rxcp->vlanf))
|
|
|
4b0fbfc |
+ if (rxcp->vlanf)
|
|
|
4b0fbfc |
__vlan_hwaccel_put_tag(skb, rxcp->vlan_tag);
|
|
|
4b0fbfc |
|
|
|
4b0fbfc |
netif_receive_skb(skb);
|
|
|
4b0fbfc |
@@ -1249,7 +1249,7 @@ static void be_rx_compl_process_gro(struct be_adapter *adapter,
|
|
|
4b0fbfc |
if (adapter->netdev->features & NETIF_F_RXHASH)
|
|
|
4b0fbfc |
skb->rxhash = rxcp->rss_hash;
|
|
|
4b0fbfc |
|
|
|
4b0fbfc |
- if (unlikely(rxcp->vlanf))
|
|
|
4b0fbfc |
+ if (rxcp->vlanf)
|
|
|
4b0fbfc |
__vlan_hwaccel_put_tag(skb, rxcp->vlan_tag);
|
|
|
4b0fbfc |
|
|
|
4b0fbfc |
napi_gro_frags(&eq_obj->napi);
|
|
|
4b0fbfc |
--
|
|
|
4b0fbfc |
1.7.6.4
|
|
|
4b0fbfc |
|