| From 82f15998fafe683add83f7a11b2e25f919b3cd2d Mon Sep 17 00:00:00 2001 |
| From: Jiri Pirko <jpirko@redhat.com> |
| Date: Tue, 25 Oct 2011 13:47:16 -0400 |
| Subject: [PATCH] benet: remove bogus "unlikely" on vlan check |
| |
| 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> |
| Backported-by: Josh Boyer <jwboyer@redhat.com> |
| |
| 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 c411bb1..6df0c7e 100644 |
| |
| |
| @@ -1192,7 +1192,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); |
| @@ -1249,7 +1249,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.4 |
| |