[PATCH net-next v2] ne2k: Enable RW-Bugfix

[PATCH net-next v2] ne2k: Enable RW-Bugfix

[Armin Wolf]

Correct a typo in ne.c and ne2k-pci.c which
prevented activation of the RW-Bugfix.
Also enable the RW-Bugfix by default since
not doing so could (according to the Datasheet)
cause the system to lock up with some chips.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
---
v2 changes:
- change NE8390_RW_BUGFIX to NE_RW_BUGFIX
---
 drivers/net/ethernet/8390/ne.c       | 4 ++--
 drivers/net/ethernet/8390/ne2k-pci.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c
index 1c97e39b478e..54b183027900 100644
--- a/drivers/net/ethernet/8390/ne.c
+++ b/drivers/net/ethernet/8390/ne.c
@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
 /* #define NE_SANITY_CHECK */

 /* Do we implement the read before write bugfix ? */
-/* #define NE_RW_BUGFIX */
+#define NE_RW_BUGFIX

 /* Do we have a non std. amount of memory? (in units of 256 byte pages) */
 /* #define PACKETBUF_MEMSIZE	0x40 */
@@ -710,7 +710,7 @@ static void ne_block_output(struct net_device *dev, int count,
 retry:
 #endif

-#ifdef NE8390_RW_BUGFIX
+#ifdef NE_RW_BUGFIX
 	/* Handle the read-before-write bug the same way as the
 	   Crynwr packet driver -- the NatSemi method doesn't work.
 	   Actually this doesn't always work either, but if you have
diff --git a/drivers/net/ethernet/8390/ne2k-pci.c b/drivers/net/ethernet/8390/ne2k-pci.c
index bc6edb3f1af3..1ed20bb4313a 100644
--- a/drivers/net/ethernet/8390/ne2k-pci.c
+++ b/drivers/net/ethernet/8390/ne2k-pci.c
@@ -91,7 +91,7 @@ MODULE_PARM_DESC(full_duplex, "full duplex setting(s) (1)");
 #define USE_LONGIO

 /* Do we implement the read before write bugfix ? */
-/* #define NE_RW_BUGFIX */
+#define NE_RW_BUGFIX

 /* Flags.  We rename an existing ei_status field to store flags!
  * Thus only the low 8 bits are usable for non-init-time flags.
@@ -610,7 +610,7 @@ static void ne2k_pci_block_output(struct net_device *dev, int count,
 	/* We should already be in page 0, but to be safe... */
 	outb(E8390_PAGE0+E8390_START+E8390_NODMA, nic_base + NE_CMD);

-#ifdef NE8390_RW_BUGFIX
+#ifdef NE_RW_BUGFIX
 	/* Handle the read-before-write bug the same way as the
 	 * Crynwr packet driver -- the NatSemi method doesn't work.
 	 * Actually this doesn't always work either, but if you have
--
2.20.1

Re: [PATCH net-next v2] ne2k: Enable RW-Bugfix

[Jakub Kicinski]

On Sat, 10 Oct 2020 18:17:11 +0200 Armin Wolf wrote:
> Correct a typo in ne.c and ne2k-pci.c which
> prevented activation of the RW-Bugfix.
> Also enable the RW-Bugfix by default since
> not doing so could (according to the Datasheet)
> cause the system to lock up with some chips.
> 
> Signed-off-by: Armin Wolf <W_Armin@gmx.de>
> ---
> v2 changes:
> - change NE8390_RW_BUGFIX to NE_RW_BUGFIX

I'm not applying this, sorry.

It's been this way since Linux 1.2 and you're giving no information
about why the change is needed in practice.