diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-07-24 03:38:13 -0400 |
| commit | b71426eb10d904d421b36f51f93c8d0ba558edac (patch) | |
| tree | a8c7088a6b89499134e01750652aa55f2baa890f /drivers/char/synclink.c | |
| parent | 8419dc8a34d765f2ff1aa4051084d54cfeff09cf (diff) | |
| parent | abb5a5cc6bba1516403146c5b79036fe843beb70 (diff) | |
| download | op-kernel-dev-b71426eb10d904d421b36f51f93c8d0ba558edac.zip op-kernel-dev-b71426eb10d904d421b36f51f93c8d0ba558edac.tar.gz | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/char/synclink.c')
| -rw-r--r-- | drivers/char/synclink.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/char/synclink.c b/drivers/char/synclink.c index df782dd..78b1b1a 100644 --- a/drivers/char/synclink.c +++ b/drivers/char/synclink.c @@ -1344,8 +1344,12 @@ static void mgsl_isr_io_pin( struct mgsl_struct *info ) } else info->input_signal_events.dcd_down++; #ifdef CONFIG_HDLC - if (info->netcount) - hdlc_set_carrier(status & MISCSTATUS_DCD, info->netdev); + if (info->netcount) { + if (status & MISCSTATUS_DCD) + netif_carrier_on(info->netdev); + else + netif_carrier_off(info->netdev); + } #endif } if (status & MISCSTATUS_CTS_LATCHED) @@ -7844,8 +7848,10 @@ static int hdlcdev_open(struct net_device *dev) spin_lock_irqsave(&info->irq_spinlock, flags); usc_get_serial_signals(info); spin_unlock_irqrestore(&info->irq_spinlock, flags); - hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, dev); - + if (info->serial_signals & SerialSignal_DCD) + netif_carrier_on(dev); + else + netif_carrier_off(dev); return 0; } |
