Commit fbeff3c1 authored by Krzysztof Halasa's avatar Krzysztof Halasa Committed by David S. Miller
Browse files

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



WAN: Converted synclink drivers to use netif_carrier_*() instead
of hdlc_set_carrier().

Signed-off-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41b1d174

drivers/char/pcmcia/synclink_cs.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -1174,8 +1174,12 @@ static void dcd_change(MGSLPC_INFO *info) 
	else

	else

		info->input_signal_events.dcd_down++;

		info->input_signal_events.dcd_down++;

#ifdef CONFIG_HDLC

#ifdef CONFIG_HDLC

	if (info->netcount)

	if (info->netcount) {

		hdlc_set_carrier(info->serial_signals & SerialSignal_DCD, info->netdev);

		if (info->serial_signals & SerialSignal_DCD)

			netif_carrier_on(info->netdev);

		else

			netif_carrier_off(info->netdev);

	}

#endif

#endif

	wake_up_interruptible(&info->status_event_wait_q);

	wake_up_interruptible(&info->status_event_wait_q);

	wake_up_interruptible(&info->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);

	spin_lock_irqsave(&info->lock, flags);

	get_signals(info);

	get_signals(info);

	spin_unlock_irqrestore(&info->lock, flags);

	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;

	return 0;

}

}

drivers/char/synclink.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -1344,8 +1344,12 @@ static void mgsl_isr_io_pin( struct mgsl_struct *info ) 
			} else

			} else

				info->input_signal_events.dcd_down++;

				info->input_signal_events.dcd_down++;

#ifdef CONFIG_HDLC

#ifdef CONFIG_HDLC

			if (info->netcount)

			if (info->netcount) {

				hdlc_set_carrier(status & MISCSTATUS_DCD, info->netdev);

				if (status & MISCSTATUS_DCD)

					netif_carrier_on(info->netdev);

				else

					netif_carrier_off(info->netdev);

			}

#endif

#endif

		}

		}

		if (status & MISCSTATUS_CTS_LATCHED)

		if (status & MISCSTATUS_CTS_LATCHED)
@@ -7844,8 +7848,10 @@ static int hdlcdev_open(struct net_device *dev) 
	spin_lock_irqsave(&info->irq_spinlock, flags);

	spin_lock_irqsave(&info->irq_spinlock, flags);

	usc_get_serial_signals(info);

	usc_get_serial_signals(info);

	spin_unlock_irqrestore(&info->irq_spinlock, flags);

	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;

	return 0;

}

}

drivers/char/synclink_gt.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -1497,8 +1497,10 @@ static int hdlcdev_open(struct net_device *dev) 
	spin_lock_irqsave(&info->lock, flags);

	spin_lock_irqsave(&info->lock, flags);

	get_signals(info);

	get_signals(info);

	spin_unlock_irqrestore(&info->lock, flags);

	spin_unlock_irqrestore(&info->lock, flags);

	hdlc_set_carrier(info->signals & SerialSignal_DCD, dev);

	if (info->signals & SerialSignal_DCD)



		netif_carrier_on(dev);

	else

		netif_carrier_off(dev);

	return 0;

	return 0;

}

}
@@ -1997,8 +1999,12 @@ static void dcd_change(struct slgt_info *info) 
		info->input_signal_events.dcd_down++;

		info->input_signal_events.dcd_down++;

	}

	}

#ifdef CONFIG_HDLC

#ifdef CONFIG_HDLC

	if (info->netcount)

	if (info->netcount) {

		hdlc_set_carrier(info->signals & SerialSignal_DCD, info->netdev);

		if (info->signals & SerialSignal_DCD)

			netif_carrier_on(info->netdev);

		else

			netif_carrier_off(info->netdev);

	}

#endif

#endif

	wake_up_interruptible(&info->status_event_wait_q);

	wake_up_interruptible(&info->status_event_wait_q);

	wake_up_interruptible(&info->event_wait_q);

	wake_up_interruptible(&info->event_wait_q);

drivers/char/synclinkmp.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -1752,8 +1752,10 @@ static int hdlcdev_open(struct net_device *dev) 
	spin_lock_irqsave(&info->lock, flags);

	spin_lock_irqsave(&info->lock, flags);

	get_signals(info);

	get_signals(info);

	spin_unlock_irqrestore(&info->lock, flags);

	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;

	return 0;

}

}
@@ -2522,8 +2524,12 @@ void isr_io_pin( SLMP_INFO *info, u16 status ) 
			} else

			} else

				info->input_signal_events.dcd_down++;

				info->input_signal_events.dcd_down++;

#ifdef CONFIG_HDLC

#ifdef CONFIG_HDLC

			if (info->netcount)

			if (info->netcount) {

				hdlc_set_carrier(status & SerialSignal_DCD, info->netdev);

				if (status & SerialSignal_DCD)

					netif_carrier_on(info->netdev);

				else

					netif_carrier_off(info->netdev);

			}

#endif

#endif

		}

		}

		if (status & MISCSTATUS_CTS_LATCHED)

		if (status & MISCSTATUS_CTS_LATCHED)