diff options
| author | Krzysztof Halasa <khc@pm.waw.pl> | 2006-07-21 23:44:55 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-07-21 23:44:55 +0200 |
| commit | fbeff3c1d35d07b1f967e47fcfb00cd16b7ecd02 (patch) | |
| tree | 4b7514b804e31b5e354ce6499256300917d1bf54 /drivers/char/synclink.c | |
| parent | [WAN]: Cosmetic changes to N2 and C101 drivers (diff) | |
| download | linux-fbeff3c1d35d07b1f967e47fcfb00cd16b7ecd02.tar.xz linux-fbeff3c1d35d07b1f967e47fcfb00cd16b7ecd02.zip | |
[WAN]: Converted synclink drivers to use netif_carrier_*()
WAN: Converted synclink drivers to use netif_carrier_*() instead
of hdlc_set_carrier().
Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
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 df782dd1098c..78b1b1a2732b 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; } |