hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] WAN: fix C101 card carrier handling 

Hi,

One of my recent changes broke C101 carrier handling, this patch
fixes it. Also fixes an old TX underrun checking bug.

2.6.18 material. Please apply.
Thanks.

Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Krzysztof Halasa 2006-08-16 01:52:23 +02:00 committed by Jeff Garzik
parent 2ca2d5e84c
commit a76b044af1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wan/c101.c
View File

@ -118,7 +118,7 @@ static inline void openwin(card_t *card, u8 page)
static inline void set_carrier(port_t *port) static inline void set_carrier(port_t *port)
{ {
if (!sca_in(MSCI1_OFFSET + ST3, port) & ST3_DCD) if (!(sca_in(MSCI1_OFFSET + ST3, port) & ST3_DCD))
netif_carrier_on(port_to_dev(port)); netif_carrier_on(port_to_dev(port));
else else
netif_carrier_off(port_to_dev(port)); netif_carrier_off(port_to_dev(port));
@ -127,10 +127,10 @@ static inline void set_carrier(port_t *port)
static void sca_msci_intr(port_t *port) static void sca_msci_intr(port_t *port)
{ {
u8 stat = sca_in(MSCI1_OFFSET + ST1, port); /* read MSCI ST1 status */ u8 stat = sca_in(MSCI0_OFFSET + ST1, port); /* read MSCI ST1 status */
/* Reset MSCI TX underrun status bit */ /* Reset MSCI TX underrun and CDCD (ignored) status bit */
sca_out(stat & ST1_UDRN, MSCI0_OFFSET + ST1, port); sca_out(stat & (ST1_UDRN | ST1_CDCD), MSCI0_OFFSET + ST1, port);
if (stat & ST1_UDRN) { if (stat & ST1_UDRN) {
struct net_device_stats *stats = hdlc_stats(port_to_dev(port)); struct net_device_stats *stats = hdlc_stats(port_to_dev(port));
@ -138,6 +138,7 @@ static void sca_msci_intr(port_t *port)
stats->tx_fifo_errors++; stats->tx_fifo_errors++;
} }
stat = sca_in(MSCI1_OFFSET + ST1, port); /* read MSCI1 ST1 status */
/* Reset MSCI CDCD status bit - uses ch#2 DCD input */ /* Reset MSCI CDCD status bit - uses ch#2 DCD input */
sca_out(stat & ST1_CDCD, MSCI1_OFFSET + ST1, port); sca_out(stat & ST1_CDCD, MSCI1_OFFSET + ST1, port);