patch-2.4.22 linux-2.4.22/drivers/net/wan/sdla_chdlc.c
Next file: linux-2.4.22/drivers/net/wan/sdla_fr.c
Previous file: linux-2.4.22/drivers/net/wan/sbni.c
Back to the patch index
Back to the overall index
- Lines: 25
- Date:
2003-08-25 04:44:42.000000000 -0700
- Orig file:
linux-2.4.21/drivers/net/wan/sdla_chdlc.c
- Orig date:
2002-11-28 15:53:14.000000000 -0800
diff -urN linux-2.4.21/drivers/net/wan/sdla_chdlc.c linux-2.4.22/drivers/net/wan/sdla_chdlc.c
@@ -591,8 +591,7 @@
if (chdlc_set_intr_mode(card, APP_INT_ON_TIMER)){
- printk (KERN_INFO "%s:
- Failed to set interrupt triggers!\n",
+ printk (KERN_INFO "%s: Failed to set interrupt triggers!\n",
card->devname);
return -EIO;
}
@@ -1089,13 +1088,11 @@
set_bit(0,&chdlc_priv_area->config_chdlc);
chdlc_priv_area->config_chdlc_timeout=jiffies;
- del_timer(&chdlc_priv_area->poll_delay_timer);
/* Start the CHDLC configuration after 1sec delay.
* This will give the interface initilization time
* to finish its configuration */
- chdlc_priv_area->poll_delay_timer.expires=jiffies+HZ;
- add_timer(&chdlc_priv_area->poll_delay_timer);
+ mod_timer(&chdlc_priv_area->poll_delay_timer, jiffies + HZ);
return err;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)