diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 12:23:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-18 12:23:07 -0800 |
| commit | e67b23c71cb9ee02d65a74c3858716ba2dedd554 (patch) | |
| tree | 17cfeadd37b93ca758aa3ffb61e02edf62289aea /drivers/net/wan/hdlc_fr.c | |
| parent | d4bf205305a9188894ac4e2e9875e42f9f8eabfd (diff) | |
| parent | f7492f17f2123f0f4db5f9e8ba89867a7b352658 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
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); |