From: Brian Maly <brian.maly@oracle.com>
Date: Wed, 31 Aug 2016 21:50:48 +0000 (-0400)
Subject: Revert "ixgbe: make a workaround to tx hang issue under dom"
X-Git-Tag: v4.1.12-92~81^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f21a357176c42b54a34c025f3173f36a7d4c1c30;p=users%2Fjedix%2Flinux-maple.git

Revert "ixgbe: make a workaround to tx hang issue under dom"

Orabug: 24574722

This reverts commit 885bb302d5bb06d7f26427133a3b8afb2115a53a.

Need to revert this commit as it causes a tx hang on dom0 for OVM

Signed-off-by: Brian Maly <brian.maly@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 78048295236d..74f2ed8a8da8 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -51,7 +51,6 @@
 #include <linux/prefetch.h>
 #include <scsi/fc/fc_fcoe.h>
 #include <net/vxlan.h>
-#include <xen/xen.h>
 
 #ifdef CONFIG_OF
 #include <linux/of_net.h>
@@ -6085,7 +6084,7 @@ int ixgbe_open(struct net_device *netdev)
 	else
 		queues = adapter->num_tx_queues;
 
-	err = netif_set_real_num_tx_queues(netdev, xen_initial_domain() ? 1 : queues);
+	err = netif_set_real_num_tx_queues(netdev, queues);
 	if (err)
 		goto err_set_queues;