From patchwork Tue Feb 14 21:20:08 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/3] benet: remove bogus "unlikely" on vlan check Date: Tue, 14 Feb 2012 11:20:08 -0000 From: Brad Figg X-Patchwork-Id: 141203 Message-Id: <1329254408-22456-4-git-send-email-brad.figg@canonical.com> To: kernel-team@lists.ubuntu.com From: Jiri Pirko 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 Signed-off-by: David S. Miller (cherry picked from commit 343e43c02850a3abcd22bd144e5bdbc92fdd273c) Signed-off-by: Brad Figg --- drivers/net/benet/be_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) 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);