[WAN]: Converted synclink drivers to use netif_carrier_*()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Krzysztof Halasa and committed by

David S. Miller 20 years ago fbeff3c1 41b1d174

+40 -16

4 changed files

expand all

drivers

char

pcmcia

synclink_cs.c

synclink.c

synclink_gt.c

synclinkmp.c

+10 -4

drivers/char/pcmcia/synclink_cs.c

··· 1174 1174 else 1175 1175 info->input_signal_events.dcd_down++; 1176 1176 #ifdef CONFIG_HDLC 1177 - if (info->netcount) 1178 - hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, info->netdev); 1177 + if (info->netcount) { 1178 + if (info->serial_signals & SerialSignal_DCD) 1179 + netif_carrier_on(info->netdev); 1180 + else 1181 + netif_carrier_off(info->netdev); 1182 + } 1179 1183 #endif 1180 1184 wake_up_interruptible(&info->status_event_wait_q); 1181 1185 wake_up_interruptible(&info->event_wait_q); ··· 4255 4251 spin_lock_irqsave(&info->lock, flags); 4256 4252 get_signals(info); 4257 4253 spin_unlock_irqrestore(&info->lock, flags); 4258 - hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, dev); 4259 - 4254 + if (info->serial_signals & SerialSignal_DCD) 4255 + netif_carrier_on(dev); 4256 + else 4257 + netif_carrier_off(dev); 4260 4258 return 0; 4261 4259 } 4262 4260

+10 -4

drivers/char/synclink.c

··· 1344 1344 } else 1345 1345 info->input_signal_events.dcd_down++; 1346 1346 #ifdef CONFIG_HDLC 1347 - if (info->netcount) 1348 - hdlc_set_carrier(status & MISCSTATUS_DCD, info->netdev); 1347 + if (info->netcount) { 1348 + if (status & MISCSTATUS_DCD) 1349 + netif_carrier_on(info->netdev); 1350 + else 1351 + netif_carrier_off(info->netdev); 1352 + } 1349 1353 #endif 1350 1354 } 1351 1355 if (status & MISCSTATUS_CTS_LATCHED) ··· 7848 7844 spin_lock_irqsave(&info->irq_spinlock, flags); 7849 7845 usc_get_serial_signals(info); 7850 7846 spin_unlock_irqrestore(&info->irq_spinlock, flags); 7851 - hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, dev); 7852 - 7847 + if (info->serial_signals & SerialSignal_DCD) 7848 + netif_carrier_on(dev); 7849 + else 7850 + netif_carrier_off(dev); 7853 7851 return 0; 7854 7852 } 7855 7853

+10 -4

drivers/char/synclink_gt.c

··· 1497 1497 spin_lock_irqsave(&info->lock, flags); 1498 1498 get_signals(info); 1499 1499 spin_unlock_irqrestore(&info->lock, flags); 1500 - hdlc_set_carrier(info->signals & SerialSignal_DCD, dev); 1501 - 1500 + if (info->signals & SerialSignal_DCD) 1501 + netif_carrier_on(dev); 1502 + else 1503 + netif_carrier_off(dev); 1502 1504 return 0; 1503 1505 } 1504 1506 ··· 1999 1997 info->input_signal_events.dcd_down++; 2000 1998 } 2001 1999 #ifdef CONFIG_HDLC 2002 - if (info->netcount) 2003 - hdlc_set_carrier(info->signals & SerialSignal_DCD, info->netdev); 2000 + if (info->netcount) { 2001 + if (info->signals & SerialSignal_DCD) 2002 + netif_carrier_on(info->netdev); 2003 + else 2004 + netif_carrier_off(info->netdev); 2005 + } 2004 2006 #endif 2005 2007 wake_up_interruptible(&info->status_event_wait_q); 2006 2008 wake_up_interruptible(&info->event_wait_q);

+10 -4

drivers/char/synclinkmp.c

··· 1752 1752 spin_lock_irqsave(&info->lock, flags); 1753 1753 get_signals(info); 1754 1754 spin_unlock_irqrestore(&info->lock, flags); 1755 - hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, dev); 1756 - 1755 + if (info->serial_signals & SerialSignal_DCD) 1756 + netif_carrier_on(dev); 1757 + else 1758 + netif_carrier_off(dev); 1757 1759 return 0; 1758 1760 } 1759 1761 ··· 2524 2522 } else 2525 2523 info->input_signal_events.dcd_down++; 2526 2524 #ifdef CONFIG_HDLC 2527 - if (info->netcount) 2528 - hdlc_set_carrier(status & SerialSignal_DCD, info->netdev); 2525 + if (info->netcount) { 2526 + if (status & SerialSignal_DCD) 2527 + netif_carrier_on(info->netdev); 2528 + else 2529 + netif_carrier_off(info->netdev); 2530 + } 2529 2531 #endif 2530 2532 } 2531 2533 if (status & MISCSTATUS_CTS_LATCHED)