From: Ethan Zhao <ethan.zhao@oracle.com>
Date: Wed, 9 Dec 2015 10:50:41 +0000 (-0800)
Subject: ixgbe: make a workaround to tx hang issue under dom
X-Git-Tag: v4.1.12-92~222^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=885bb302d5bb06d7f26427133a3b8afb2115a53a;p=users%2Fjedix%2Flinux-maple.git

ixgbe: make a workaround to tx hang issue under dom

report 1 tx queue to net core to workaround the tx hang
issue reported in Xen  environment.
The change is only limited to dom0 and baremetal is left unchanged.

Orabug: 22171500
Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>
Signed-off-by: Guru Anbalagane <guru.anbalagane@oracle.com>
---

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index ec58444dff1e7..7334296be3f0f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -51,6 +51,7 @@
 #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>
@@ -5793,7 +5794,7 @@ static int ixgbe_open(struct net_device *netdev)
 	else
 		queues = adapter->num_tx_queues;
 
-	err = netif_set_real_num_tx_queues(netdev, queues);
+	err = netif_set_real_num_tx_queues(netdev, xen_initial_domain() ? 1 : queues);
 	if (err)
 		goto err_set_queues;