diff options
| author | Krzysztof Halasa <khc@pm.waw.pl> | 2006-07-21 14:44:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-07-21 14:44:55 -0700 |
| commit | fbeff3c1d35d07b1f967e47fcfb00cd16b7ecd02 (patch) | |
| tree | 4b7514b804e31b5e354ce6499256300917d1bf54 /drivers/char/pcmcia | |
| parent | 41b1d174442d0845e58af4b1b171930fc09872c7 (diff) | |
| download | blackbird-op-linux-fbeff3c1d35d07b1f967e47fcfb00cd16b7ecd02.tar.gz blackbird-op-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/pcmcia')
| -rw-r--r-- | drivers/char/pcmcia/synclink_cs.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c index 17bc8abd5df5..00f574cbb0d4 100644 --- a/drivers/char/pcmcia/synclink_cs.c +++ b/drivers/char/pcmcia/synclink_cs.c @@ -1174,8 +1174,12 @@ static void dcd_change(MGSLPC_INFO *info) else info->input_signal_events.dcd_down++; #ifdef CONFIG_HDLC - if (info->netcount) - hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, info->netdev); + if (info->netcount) { + if (info->serial_signals & SerialSignal_DCD) + netif_carrier_on(info->netdev); + else + netif_carrier_off(info->netdev); + } #endif wake_up_interruptible(&info->status_event_wait_q); wake_up_interruptible(&info->event_wait_q); @@ -4251,8 +4255,10 @@ static int hdlcdev_open(struct net_device *dev) spin_lock_irqsave(&info->lock, flags); get_signals(info); spin_unlock_irqrestore(&info->lock, 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; } |
