diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 01:05:46 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-20 01:05:46 -0500 |
| commit | 30765528d156e58d41ed07cae8726c9105111b9d (patch) | |
| tree | 95021732c4c13eaabc88eb037fed89d38f45d496 /drivers/net/wan/hdlc_fr.c | |
| parent | e1d7a2de6c4249072dd886c129410e11e637ceff (diff) | |
| parent | 3bedff1d73b86e0cf52634efb447e9ada08f2cc6 (diff) | |
| download | talos-op-linux-30765528d156e58d41ed07cae8726c9105111b9d.tar.gz talos-op-linux-30765528d156e58d41ed07cae8726c9105111b9d.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/wan/hdlc_fr.c')
| -rw-r--r-- | drivers/net/wan/hdlc_fr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c index e1601d35dced..523afe17564e 100644 --- a/drivers/net/wan/hdlc_fr.c +++ b/drivers/net/wan/hdlc_fr.c @@ -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); |
