All of lore.kernel.org
 help / color / mirror / Atom feed
From: Armin Wolf <W_Armin@gmx.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org
Subject: [PATCH net-next v2] ne2k: Enable RW-Bugfix
Date: Sat, 10 Oct 2020 18:17:11 +0200	[thread overview]
Message-ID: <20201010161711.19129-1-W_Armin@gmx.de> (raw)

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


             reply	other threads:[~2020-10-10 23:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-10 16:17 Armin Wolf [this message]
2020-10-11 16:45 ` [PATCH net-next v2] ne2k: Enable RW-Bugfix Jakub Kicinski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201010161711.19129-1-W_Armin@gmx.de \
    --to=w_armin@gmx.de \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.