1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index d3233f59a82e..a1b52ec3b930 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -100,7 +100,6 @@
 #include <linux/of_net.h>
 
 #include "gianfar.h"
-#include "fsl_pq_mdio.h"
 
 #define TX_TIMEOUT      (1*HZ)
 
@@ -395,7 +394,13 @@ static void gfar_init_mac(struct net_device *ndev)
         if (ndev->features & NETIF_F_IP_CSUM)
                 tctrl |= TCTRL_INIT_CSUM;
 
-        tctrl |= TCTRL_TXSCHED_PRIO;
+        if (priv->prio_sched_en)
+                tctrl |= TCTRL_TXSCHED_PRIO;
+        else {
+                tctrl |= TCTRL_TXSCHED_WRRS;
+                gfar_write(&regs->tr03wt, DEFAULT_WRRS_WEIGHT);
+                gfar_write(&regs->tr47wt, DEFAULT_WRRS_WEIGHT);
+        }
 
         gfar_write(&regs->tctrl, tctrl);
 
@@ -1161,6 +1166,9 @@ static int gfar_probe(struct platform_device *ofdev)
         priv->rx_filer_enable = 1;
         /* Enable most messages by default */
         priv->msg_enable = (NETIF_MSG_IFUP << 1 ) - 1;
+        /* use pritority h/w tx queue scheduling for single queue devices */
+        if (priv->num_tx_queues == 1)
+                priv->prio_sched_en = 1;
 
         /* Carrier starts down, phylib will bring it up */
         netif_carrier_off(dev);