the following changes are necessary to compile (and run) pre7-4 with isdn.
diff -u --recursive --new-file linux-2.3.99-pre7-4/drivers/isdn/hisax/fsm.c linux-2.3.99-pre7-4-isdn/drivers/isdn/hisax/fsm.c
--- linux-2.3.99-pre7-4/drivers/isdn/hisax/fsm.c Tue Feb 15 20:40:43 2000
+++ linux-2.3.99-pre7-4-isdn/drivers/isdn/hisax/fsm.c Thu May 4 12:43:06 2000
@@ -156,7 +156,7 @@
(long) ft, millisec, where);
#endif
- if (ft->tl.next || ft->tl.prev) {
+ if (ft->tl.list.next || ft->tl.list.prev) {
printk(KERN_WARNING "FsmAddTimer: timer already active!\n");
ft->fi->printdebug(ft->fi, "FsmAddTimer already active!");
return -1;
@@ -180,7 +180,7 @@
(long) ft, millisec, where);
#endif
- if (ft->tl.next || ft->tl.prev)
+ if (ft->tl.list.next || ft->tl.list.prev)
del_timer(&ft->tl);
init_timer(&ft->tl);
ft->event = event;
diff -u --recursive --new-file linux-2.3.99-pre7-4/drivers/isdn/hisax/isdnl3.c linux-2.3.99-pre7-4-isdn/drivers/isdn/hisax/isdnl3.c
--- linux-2.3.99-pre7-4/drivers/isdn/hisax/isdnl3.c Thu Apr 13 18:03:03 2000
+++ linux-2.3.99-pre7-4-isdn/drivers/isdn/hisax/isdnl3.c Thu May 4 12:38:25 2000
@@ -238,7 +238,7 @@
L3AddTimer(struct L3Timer *t,
int millisec, int event)
{
- if (t->tl.next || t->tl.prev) {
+ if (t->tl.list.next || t->tl.list.prev) {
printk(KERN_WARNING "L3AddTimer: timer already active!\n");
return -1;
}
diff -u --recursive --new-file linux-2.3.99-pre7-4/drivers/isdn/isdn_net.c linux-2.3.99-pre7-4-isdn/drivers/isdn/isdn_net.c
--- linux-2.3.99-pre7-4/drivers/isdn/isdn_net.c Thu Apr 13 18:03:03 2000
+++ linux-2.3.99-pre7-4-isdn/drivers/isdn/isdn_net.c Thu May 4 12:34:34 2000
@@ -2799,7 +2799,7 @@
strcpy(netdev->local->name, " ");
else
strcpy(netdev->local->name, name);
- netdev->dev.name = netdev->local->name;
+ strcpy(netdev->dev.name, netdev->local->name);
netdev->dev.priv = netdev->local;
netdev->dev.init = isdn_net_init;
netdev->local->p_encap = ISDN_NET_ENCAP_RAWIP;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sun May 07 2000 - 21:00:14 EST