Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f7bad72 authored by Krzysztof Halasa's avatar Krzysztof Halasa Committed by John W. Linville
Browse files

[PATCH] Generic HDLC WAN drivers - disable netif_carrier_off() 



As we are currently unable to fix the problem with carrier and protocol
state signaling in net core I've to disable netif_carrier_off()
calls used by WAN protocol drivers. The attached patch should make
them working again.

The remaining netif_carrier_*() calls in hdlc_fr.c are fine as they
don't touch the physical device.

Signed-off-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cd52d1ee

drivers/net/wan/hdlc_cisco.c

+6 −0
Original line number Diff line number Diff line
@@ -192,7 +192,9 @@ static int cisco_rx(struct sk_buff *skb) 
					       "uptime %ud%uh%um%us)\n",

					       dev->name, days, hrs,

					       min, sec);

#if 0

					netif_carrier_on(dev);

#endif

					hdlc->state.cisco.up = 1;

				}

			}
@@ -225,7 +227,9 @@ static void cisco_timer(unsigned long arg) 
		       hdlc->state.cisco.settings.timeout * HZ)) {

		hdlc->state.cisco.up = 0;

		printk(KERN_INFO "%s: Link down\n", dev->name);

#if 0

		netif_carrier_off(dev);

#endif

	}



	cisco_keepalive_send(dev, CISCO_KEEPALIVE_REQ,
@@ -261,8 +265,10 @@ static void cisco_stop(struct net_device *dev) 
{

	hdlc_device *hdlc = dev_to_hdlc(dev);

	del_timer_sync(&hdlc->state.cisco.timer);

#if 0

	if (netif_carrier_ok(dev))

		netif_carrier_off(dev);

#endif

	hdlc->state.cisco.up = 0;

	hdlc->state.cisco.request_sent = 0;

}

drivers/net/wan/hdlc_fr.c

+4 −0
Original line number Diff line number Diff line
@@ -545,8 +545,10 @@ static void fr_set_link_state(int reliable, struct net_device *dev) 


	hdlc->state.fr.reliable = reliable;

	if (reliable) {

#if 0

		if (!netif_carrier_ok(dev))

			netif_carrier_on(dev);

#endif



		hdlc->state.fr.n391cnt = 0; /* Request full status */

		hdlc->state.fr.dce_changed = 1;
@@ -560,8 +562,10 @@ static void fr_set_link_state(int reliable, struct net_device *dev) 
			}

		}

	} else {

#if 0

		if (netif_carrier_ok(dev))

			netif_carrier_off(dev);

#endif



		while (pvc) {		/* Deactivate all PVCs */

			pvc_carrier(0, pvc);

drivers/net/wan/hdlc_generic.c

+6 −0
Original line number Diff line number Diff line
@@ -79,11 +79,13 @@ static void __hdlc_set_carrier_on(struct net_device *dev) 
	hdlc_device *hdlc = dev_to_hdlc(dev);

	if (hdlc->proto.start)

		return hdlc->proto.start(dev);

#if 0

#ifdef DEBUG_LINK

	if (netif_carrier_ok(dev))

		printk(KERN_ERR "hdlc_set_carrier_on(): already on\n");

#endif

	netif_carrier_on(dev);

#endif

}
@@ -94,11 +96,13 @@ static void __hdlc_set_carrier_off(struct net_device *dev) 
	if (hdlc->proto.stop)

		return hdlc->proto.stop(dev);



#if 0

#ifdef DEBUG_LINK

	if (!netif_carrier_ok(dev))

		printk(KERN_ERR "hdlc_set_carrier_off(): already off\n");

#endif

	netif_carrier_off(dev);

#endif

}
@@ -294,8 +298,10 @@ int register_hdlc_device(struct net_device *dev) 
	if (result != 0)

		return -EIO;



#if 0

	if (netif_carrier_ok(dev))

		netif_carrier_off(dev); /* no carrier until DCD goes up */

#endif



	return 0;

}