Patchwork [3/3] benet: remove bogus "unlikely" on vlan check

login
register
mail settings
Submitter Brad Figg
Date Feb. 14, 2012, 9:20 p.m.
Message ID <1329254408-22456-4-git-send-email-brad.figg@canonical.com>
Download mbox | patch
Permalink /patch/141203/
State New
Headers show

Comments

Brad Figg - Feb. 14, 2012, 9:20 p.m.
From: Jiri Pirko <jpirko@redhat.com>

CVE-CVE-2011-3347

BugLink: http://bugs.launchpad.net/bugs/880893

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>
(cherry picked from commit 343e43c02850a3abcd22bd144e5bdbc92fdd273c)
Signed-off-by: Brad Figg <brad.figg@canonical.com>
---
 drivers/net/benet/be_main.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index bf8d198..c258fae 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1195,7 +1195,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);
@@ -1252,7 +1252,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);