From e92ca6763b7b795e534a187a4fe9dce0ae313bae Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Thu, 25 Aug 2011 02:50:51 +0000 Subject: [PATCH] --- yaml --- r: 265587 b: refs/heads/master c: 343e43c02850a3abcd22bd144e5bdbc92fdd273c h: refs/heads/master i: 265585: 373ebadea46b26b15b8f3ff525cd44fa8fcf70b4 265583: 2f7c46fb4ce123fa79af0143d95ee8e10454fcc3 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/emulex/benet/be_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index eee35a21c000..986d0e43c2b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3c9c36bcedd426f2be2826da43e5163de61735f7 +refs/heads/master: 343e43c02850a3abcd22bd144e5bdbc92fdd273c diff --git a/trunk/drivers/net/ethernet/emulex/benet/be_main.c b/trunk/drivers/net/ethernet/emulex/benet/be_main.c index fb2eda08a094..3d55b4767ae4 100644 --- a/trunk/drivers/net/ethernet/emulex/benet/be_main.c +++ b/trunk/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);