summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2016-09-11 10:10:30 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2020-10-12 21:55:32 +0100
commitdfaeb24d717abd2a9398ac89f88b59ac9f91441d (patch)
tree1172a8a19f5dffb37de9e48b40e3a1781f00a3ff
parentc323286a50edfec45fa1f89102edb3cfacb787f9 (diff)
3c589_cs 16-bit pcmcia fix
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r--drivers/net/ethernet/3com/3c589_cs.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index 09816e84314d..00f790cd6efe 100644
--- a/drivers/net/ethernet/3com/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
@@ -578,7 +578,11 @@ static netdev_tx_t el3_start_xmit(struct sk_buff *skb,
outw(skb->len, ioaddr + TX_FIFO);
outw(0x00, ioaddr + TX_FIFO);
/* ... and the packet rounded to a doubleword. */
+#if 0
outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2);
+#else
+ outsw(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2 << 1);
+#endif
if (inw(ioaddr + TX_FREE) <= 1536) {
netif_stop_queue(dev);
@@ -858,8 +862,13 @@ static int el3_rx(struct net_device *dev)
pkt_len, rx_status);
if (skb != NULL) {
skb_reserve(skb, 2);
+#if 0
insl(ioaddr+RX_FIFO, skb_put(skb, pkt_len),
(pkt_len+3)>>2);
+#else
+ insw(ioaddr+RX_FIFO, skb_put(skb, pkt_len),
+ (pkt_len+3)>>2 << 1);
+#endif
skb->protocol = eth_type_trans(skb, dev);
netif_rx(skb);
dev->stats.rx_packets++;