From b738efc4484407082d09ea5fbfa4c87368d0808b Mon Sep 17 00:00:00 2001
From: "Nagaraj, Suresh" <suresh.nagaraj@intel.com>
Date: Fri, 6 Apr 2018 09:57:26 +0200
Subject: [PATCH] Merge pull request #296 in SW_PON/linux from
feature/UGW_SW-24431-enable-the-irq-mode-in-tso-and-fix-the-data-corruption-in-samba-read
to 8.1_ER2
* commit '5c49857a71f1e33ca25414bfb66c80a8cc1348d3':
Jira id: UGW_SW-24431: change tso to IRQ mode and chunk size to 512 bytes
---
drivers/net/ethernet/lantiq/ltq_toe_drv.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/lantiq/ltq_toe_drv.c b/drivers/net/ethernet/lantiq/ltq_toe_drv.c
index 34bea62b3..3cb4c2c5f 100644
--- a/drivers/net/ethernet/lantiq/ltq_toe_drv.c
+++ b/drivers/net/ethernet/lantiq/ltq_toe_drv.c
@@ -71,8 +71,8 @@ static unsigned char __iomem *ltq_toe_membase; /* Virtual */
/*static const unsigned char __iomem *lro_sram_membase_res0 = (unsigned char *)0xE2013000;*/
static unsigned char __iomem *lro_sram_membase_res0;
/*static unsigned int lro_sram_membase_res1 = 0xE2013100;*/
-static u32 g_tso_polling_mode = 1;
-static u32 g_tso_irq_mode;
+static u32 g_tso_polling_mode;
+static u32 g_tso_irq_mode = 1;
static struct device *g_toe_dev;
@@ -1752,7 +1752,7 @@ int ltq_tso_xmit (struct sk_buff *skb, struct pmac_tx_hdr *pmac, int hdr_size, i
/* Check that CMD port is available */
toe_get_cmd_own(port);
len = skb->len - skb->data_len;
- toe_fill_cmd0(1, 1, 1, toe_g, 2, len, toe_last, port);
+ toe_fill_cmd0(1, 1, 1, toe_g, 0, len, toe_last, port);
toe_fill_cmd1(skb->data, ~toe_sioc, port, len);
asm("sync");
toe_fill_cmd2(skb->DW0, port);
@@ -1781,7 +1781,7 @@ int ltq_tso_xmit (struct sk_buff *skb, struct pmac_tx_hdr *pmac, int hdr_size, i
/* Check that CMD port is available */
toe_get_cmd_own(port);
/* CMD0 - Fill frag length */
- toe_fill_cmd0(1, 1, 1, toe_g, 2, skb_frag_size(frag), toe_last, port);
+ toe_fill_cmd0(1, 1, 1, toe_g, 0, skb_frag_size(frag), toe_last, port);
/* CMD1 - Fill frag i */
frag_addr = skb_frag_address(frag);
--
GitLab