Linux 2.0.36pre21

o       Alain Knaff fix for a new exciting and broken floppy controller
        some people are shipping
o       ISDN compiles + a couple of last minute glitch fixes from
        Karsten & Fritz
o       RCPCI45 fix (MODVERSIONS=n breakage) - David Murn
o       Shaper divide by zero crash fix - Ditto

Perhaps we've finally finished ;)

Alan

diff --git a/Documentation/isdn/README.HiSax b/Documentation/isdn/README.HiSax
index 17173e11948e8b1db5f7e33d4d542d9b21267faf..d34533addd30bdd00d55acd93896fb23e7103003 100644 (file)
--- a/Documentation/isdn/README.HiSax
+++ b/Documentation/isdn/README.HiSax
@@ -149,6 +149,7 @@ Card types:
    13   HFC-2BS0 based cards     irq, io
    14   Teles 16.3c PnP          irq, io
    15   Sedlbauer Speed Card     irq, io
+   15   Sedlbauer PC/104         irq, io
    15   Sedlbauer Speed PCI     no parameter
    16   USR Sportster internal   irq, io
    17   MIC card                 irq, io
@@ -243,6 +244,7 @@ type
    13  HFC-2BS0 based cards    pa=irq  pb=io
    14   Teles 16.3c PnP         ONLY WORKS AS A MODULE !
    15  Sedlbauer Speed Card    pa=irq  pb=io (Speed Win only as module !)
+   15   Sedlbauer PC/104        pa=irq  pb=io
    15   Sedlbauer Speed PCI    no parameter
    16   USR Sportster internal  pa=irq  pb=io
    17   MIC card                pa=irq  pb=io
@@ -353,6 +355,20 @@ configurable with
 hisaxctrl <DriverId> 2 <delay>
 <delay> in ms Value between 50 and 800 ms is recommended.
 
+Downloading Firmware
+--------------------
+At the moment, the Sedlbauer speed fax+ is the only card, which
+needs to download firmware.
+The firmware is downloaded with the hisaxctrl tool:
+
+    hisaxctrl <DriverId> 9 <firmware_filename>
+
+<DriverId> default is HiSax, if you didn't specify one,
+
+where <firmware_filename> is the filename of the firmware file.
+
+For example, 'hisaxctrl HiSax 9 ISAR.BIN' downloads the firmware for
+ISAR based cards (like the Sedlbauer speed fax+).
 
 Warning
 -------

diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c
index 42ac124498d611e4e03e480c6ce146db0f69d8f9..8b3b63b60a14d47bc60060a52231cd3d65a958de 100644 (file)
--- a/drivers/isdn/hisax/config.c
+++ b/drivers/isdn/hisax/config.c
@@ -1,10 +1,17 @@
-/* $Id: config.c,v 1.15.2.21 1998/11/05 21:13:46 keil Exp $
+/* $Id: config.c,v 1.15.2.23 1998/11/11 11:04:36 keil Exp $
 
  * Author       Karsten Keil (keil@isdn4linux.de)
  *              based on the teles driver from Jan den Ouden
  *
  *
  * $Log: config.c,v $
+ * Revision 1.15.2.23  1998/11/11 11:04:36  keil
+ * update version
+ *
+ * Revision 1.15.2.22  1998/11/08 13:00:56  niemann
+ * Added doc for Sedlbauer ISDN cards,
+ * added info for downloading firmware (Sedlbauer speed fax+)
+ *
  * Revision 1.15.2.21  1998/11/05 21:13:46  keil
  * minor fixes
  *
@@ -119,6 +126,8 @@
  *   13 Teleint          p0=irq p1=iobase
  *   14 Teles 16.3c      p0=irq p1=iobase
  *   15 Sedlbauer speed  p0=irq p1=iobase
+ *   15 Sedlbauer PC/104       p0=irq p1=iobase
+ *   15 Sedlbauer speed pci    no parameter
  *   16 USR Sportster internal  p0=irq  p1=iobase
  *   17 MIC card                p0=irq  p1=iobase
  *   18 ELSA Quickstep 1000PCI  no parameter
@@ -421,7 +430,11 @@ HiSaxVersion(void))
        char tmp[64];
 
        printk(KERN_INFO "HiSax: Linux Driver for passive ISDN cards\n");
-       printk(KERN_INFO "HiSax: Version 3.0e\n");
+#ifdef MODULE
+       printk(KERN_INFO "HiSax: Version 3.1 (module)\n");
+#else
+       printk(KERN_INFO "HiSax: Version 3.1 (kernel)\n");
+#endif
        strcpy(tmp, l1_revision);
        printk(KERN_INFO "HiSax: Layer1 Revision %s\n", HiSax_getrev(tmp));
        strcpy(tmp, l2_revision);

diff --git a/drivers/isdn/hisax/sedlbauer.c b/drivers/isdn/hisax/sedlbauer.c
index f6265f056784fb5c78817bd1e07218758146cb3b..3acc099c9078b4048b265dcfaa4e753a64d9bec5 100644 (file)
--- a/drivers/isdn/hisax/sedlbauer.c
+++ b/drivers/isdn/hisax/sedlbauer.c
@@ -1,9 +1,10 @@
-/* $Id: sedlbauer.c,v 1.1.2.15 1998/11/03 00:07:32 keil Exp $
+/* $Id: sedlbauer.c,v 1.1.2.16 1998/11/08 13:01:01 niemann Exp $
 
  * sedlbauer.c  low level stuff for Sedlbauer cards
  *              includes support for the Sedlbauer speed star (speed star II),
+ *              support for the Sedlbauer speed fax+,
  *              support for the Sedlbauer ISDN-Controller PC/104 and
- *             support for the Sedlbauer speed pci
+ *              support for the Sedlbauer speed pci
  *              derived from the original file asuscom.c from Karsten Keil
  *
  * Copyright (C) 1997,1998 Marcus Niemann (for the modifications to
@@ -16,6 +17,10 @@
  *            Edgar Toernig
  *
  * $Log: sedlbauer.c,v $
+ * Revision 1.1.2.16  1998/11/08 13:01:01  niemann
+ * Added doc for Sedlbauer ISDN cards,
+ * added info for downloading firmware (Sedlbauer speed fax+)
+ *
  * Revision 1.1.2.15  1998/11/03 00:07:32  keil
  * certification related changes
  * fixed logging for smaller stack use
@@ -80,6 +85,11 @@
  * ISDN PC/104 IPAC            DIP-SWITCH
  * Speed Star2 IPAC            CARDMGR
  * Speed PCI   IPAC            PNP             
+ *
+ * Important:
+ * For the sedlbauer speed fax+ to work properly you have to download 
+ * the firmware onto the card.
+ * For example: hisaxctrl <DriverID> 9 ISAR.BIN
 */
 
 #define SEDLBAUER_PCI 1
@@ -97,7 +107,7 @@
 
 extern const char *CardType[];
 
-const char *Sedlbauer_revision = "$Revision: 1.1.2.15 $";
+const char *Sedlbauer_revision = "$Revision: 1.1.2.16 $";
 
 const char *Sedlbauer_Types[] =
        {"None", "speed card/win", "speed star", "speed fax+", 

diff --git a/drivers/isdn/isdn_net.c b/drivers/isdn/isdn_net.c
index caab7f8f9ead3942b63aad8bbcd79ef9d16cdf6d..bb43dc9c60bbfc618272c2eecf701f10586c337a 100644 (file)
--- a/drivers/isdn/isdn_net.c
+++ b/drivers/isdn/isdn_net.c
@@ -1190,8 +1190,6 @@ isdn_net_xmit(struct device *ndev, isdn_net_local * lp, struct sk_buff *skb)
 {
        int ret;
 
-       (void)isdn_net_recalc_timeout(ISDN_TIMRU_KEEPUP_OUT,
-               ISDN_TIMRU_PACKET_SKB, ndev, skb, 0);
        /* For the other encaps the header has already been built */
 #ifdef CONFIG_ISDN_PPP
        if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP) {

diff --git a/drivers/isdn/pcbit/pcbit.h b/drivers/isdn/pcbit/pcbit.h
index 89a608904d7d8f44d6a7c3924309f2ded359fced..20051bf3ec13552035708aceb850e5799ed51e7b 100644 (file)
--- a/drivers/isdn/pcbit/pcbit.h
+++ b/drivers/isdn/pcbit/pcbit.h
@@ -98,7 +98,7 @@ struct pcbit_dev {
 };
 
 #define STATS_TIMER (10*HZ)
-#define ERRTIME     (0.1*HZ)
+#define ERRTIME     (HZ/10)
 
 /* MRU */
 #define MAXBUFSIZE  1534

diff --git a/drivers/net/rcpci45.c b/drivers/net/rcpci45.c
index 30eae957781b11c82fb99eade0d6c674ecb9703c..ebc5f1f61fd09dca422e93243dd86e3cd9147a21 100644 (file)
--- a/drivers/net/rcpci45.c
+++ b/drivers/net/rcpci45.c
@@ -44,11 +44,10 @@ static char *version =
 
 
 #include <linux/config.h>
-#include <linux/modversions.h>
 #include <linux/module.h>
 #include <linux/version.h>
 
-char kernel_version [] = UTS_RELEASE;
+static char kernel_version [] = UTS_RELEASE;
 
 #include <linux/kernel.h>
 #include <linux/sched.h>

diff --git a/drivers/net/shaper.c b/drivers/net/shaper.c
index ace995c843c93eff0735009dbb51c3614a41ef41..3c95db9a7f1b9c12d9f5f9e9851eb41bb8839a40 100644 (file)
--- a/drivers/net/shaper.c
+++ b/drivers/net/shaper.c
@@ -381,10 +381,14 @@ static int shaper_open(struct device *dev)
        
        /*
         *      Can't open until attached.
+        *      Also can't open until speed is set, or we'll get
+        *      a division by zero.
         */
         
        if(shaper->dev==NULL)
                return -ENODEV;
+       if(shaper->bitspersec==0)
+               return -EINVAL;
        MOD_INC_USE_COUNT;
        return 0;
 }
@@ -462,6 +466,7 @@ static int shaper_attach(struct device *shdev, struct shaper *sh, struct device
        shdev->type=dev->type;
        shdev->addr_len=dev->addr_len;
        shdev->mtu=dev->mtu;
+       sh->bitspersec=0;
        return 0;
 }