diff options
| author |   Sathya Perla <sathya.perla@emulex.com> | 2012-06-05 19:37:21 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-06-06 09:06:18 -0700 |
| commit | 421737bdd51912d136ca3e554f54731039d95847 (patch) | |
| tree | 42e193fa49ede8c2f34d9787d6c45c426607ea71 | |
| parent | be2net: fix reporting number of actual rx queues (diff) | |
| download | linux-dev-421737bdd51912d136ca3e554f54731039d95847.tar.xz linux-dev-421737bdd51912d136ca3e554f54731039d95847.zip | |
be2net: remove unnecessary usage of unlikely()
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 3aa478f50358..42ee75b794b6 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -719,8 +719,8 @@ static netdev_tx_t be_xmit(struct sk_buff *skb, * 60 bytes long. * As a workaround disable TX vlan offloading in such cases. */ - if (unlikely(vlan_tx_tag_present(skb) && - (skb->ip_summed != CHECKSUM_PARTIAL || skb->len <= 60))) { + if (vlan_tx_tag_present(skb) && + (skb->ip_summed != CHECKSUM_PARTIAL || skb->len <= 60)) { skb = skb_share_check(skb, GFP_ATOMIC); if (unlikely(!skb)) goto tx_drop; |