retronetworking
/
isdn4linux
13
0
Fork 0
Code Pull Requests Releases Activity

backported changes from kernel 2.3.14: 

- several #include "config.h" gone, others come.
- "struct device" changed to "struct net_device" in 2.3.14, added a
  define in isdn_compat.h for older kernel versions.
This commit is contained in:
Carsten Paeth 1999-08-22 20:27:19 +00:00
parent 4efbd1aa24
commit 54695e9296
31 changed files with 151 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/isdn/avmb1/b1.c
View File

@ -6,6 +6,9 @@
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de) * (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
* *
* $Log$ * $Log$
* Revision 1.7 1999/08/04 10:10:09 calle
* Bugfix: corrected /proc functions, added structure for new AVM cards.
*
* Revision 1.6 1999/07/23 08:51:04 calle * Revision 1.6 1999/07/23 08:51:04 calle
* small fix and typo in checkin before. * small fix and typo in checkin before.
* *
@ -44,7 +47,6 @@
* *
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>

4
drivers/isdn/avmb1/b1isa.c
View File

@ -6,6 +6,9 @@
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de) * (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
* *
* $Log$ * $Log$
* Revision 1.3 1999/07/09 15:05:40 keil
* compat.h is now isdn_compat.h
*
* Revision 1.2 1999/07/05 15:09:49 calle * Revision 1.2 1999/07/05 15:09:49 calle
* - renamed "appl_release" to "appl_released". * - renamed "appl_release" to "appl_released".
* - version und profile data now cleared on controller reset * - version und profile data now cleared on controller reset
@ -31,7 +34,6 @@
* *
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>

4
drivers/isdn/avmb1/b1pcmcia.c
View File

@ -6,6 +6,9 @@
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de) * (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
* *
* $Log$ * $Log$
* Revision 1.3 1999/07/09 15:05:41 keil
* compat.h is now isdn_compat.h
*
* Revision 1.2 1999/07/05 15:09:51 calle * Revision 1.2 1999/07/05 15:09:51 calle
* - renamed "appl_release" to "appl_released". * - renamed "appl_release" to "appl_released".
* - version und profile data now cleared on controller reset * - version und profile data now cleared on controller reset
@ -31,7 +34,6 @@
* *
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>

4
drivers/isdn/avmb1/t1isa.c
View File

@ -6,6 +6,9 @@
* (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de) * (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
* *
* $Log$ * $Log$
* Revision 1.4 1999/07/09 15:05:50 keil
* compat.h is now isdn_compat.h
*
* Revision 1.3 1999/07/06 07:42:04 calle * Revision 1.3 1999/07/06 07:42:04 calle
* - changes in /proc interface * - changes in /proc interface
* - check and changed calls to [dev_]kfree_skb and [dev_]alloc_skb. * - check and changed calls to [dev_]kfree_skb and [dev_]alloc_skb.
@ -35,7 +38,6 @@
* *
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>

5
drivers/isdn/divert/divert_init.c
View File

@ -20,6 +20,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.3 1999/07/05 20:21:39 werner
* changes to use diversion sources for all kernel versions.
* removed static device, only proc filesystem used
*
* Revision 1.2 1999/07/04 21:37:30 werner * Revision 1.2 1999/07/04 21:37:30 werner
* Ported from kernel version 2.0 * Ported from kernel version 2.0
* *
@ -27,7 +31,6 @@
* *
*/ */
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/version.h> #include <linux/version.h>
#include "isdn_divert.h" #include "isdn_divert.h"

4
drivers/isdn/divert/isdn_divert.c
View File

@ -20,13 +20,15 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.2 1999/07/04 21:37:32 werner
* Ported from kernel version 2.0
*
* *
* *
*/ */
#include <linux/config.h>
#define __NO_VERSION__ #define __NO_VERSION__
#include <linux/module.h> #include <linux/module.h>
#include <linux/version.h> #include <linux/version.h>

4
drivers/isdn/divert/isdn_divert.h
View File

@ -20,13 +20,15 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.2 1999/07/04 21:37:33 werner
* Ported from kernel version 2.0
*
* *
* *
*/ */
#include <linux/config.h>
#include <linux/ioctl.h> #include <linux/ioctl.h>
#include <linux/types.h> #include <linux/types.h>

7
drivers/isdn/eicon/eicon.h
View File

@ -21,6 +21,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.9 1999/08/18 20:16:57 armin
* Added XLOG function for all cards.
* Bugfix of alloc_skb NULL pointer.
*
* Revision 1.8 1999/07/25 15:12:01 armin * Revision 1.8 1999/07/25 15:12:01 armin
* fix of some debug logs. * fix of some debug logs.
* enabled ISA-cards option. * enabled ISA-cards option.
@ -188,12 +192,15 @@ typedef struct {
#ifdef __KERNEL__ #ifdef __KERNEL__
/* Kernel includes */ /* Kernel includes */
#include <linux/config.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/tqueue.h> #include <linux/tqueue.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/fs.h>
#include <linux/major.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/io.h> #include <asm/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>

5
drivers/isdn/eicon/eicon_idi.c
View File

@ -21,6 +21,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.12 1999/08/18 20:16:59 armin
* Added XLOG function for all cards.
* Bugfix of alloc_skb NULL pointer.
*
* Revision 1.11 1999/07/25 15:12:03 armin * Revision 1.11 1999/07/25 15:12:03 armin
* fix of some debug logs. * fix of some debug logs.
* enabled ISA-cards option. * enabled ISA-cards option.
@ -70,6 +74,7 @@
* *
*/ */
#include <linux/config.h>
#define __NO_VERSION__ #define __NO_VERSION__
#include "eicon.h" #include "eicon.h"
#include "eicon_idi.h" #include "eicon_idi.h"

5
drivers/isdn/eicon/eicon_idi.h
View File

@ -21,6 +21,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.6 1999/07/25 15:12:04 armin
* fix of some debug logs.
* enabled ISA-cards option.
*
* Revision 1.5 1999/07/11 17:16:26 armin * Revision 1.5 1999/07/11 17:16:26 armin
* Bugfixes in queue handling. * Bugfixes in queue handling.
* Added DSP-DTMF decoder functions. * Added DSP-DTMF decoder functions.
@ -50,6 +54,7 @@
#ifndef IDI_H #ifndef IDI_H
#define IDI_H #define IDI_H
#include <linux/config.h>
#define ASSIGN 0x01 #define ASSIGN 0x01
#define REMOVE 0xff #define REMOVE 0xff

5
drivers/isdn/eicon/eicon_io.c
View File

@ -24,6 +24,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.3 1999/08/18 20:17:01 armin
* Added XLOG function for all cards.
* Bugfix of alloc_skb NULL pointer.
*
* Revision 1.2 1999/07/25 15:12:05 armin * Revision 1.2 1999/07/25 15:12:05 armin
* fix of some debug logs. * fix of some debug logs.
* enabled ISA-cards option. * enabled ISA-cards option.
@ -36,6 +40,7 @@
*/ */
#include <linux/config.h>
#include "eicon.h" #include "eicon.h"
void void

5
drivers/isdn/eicon/eicon_isa.c
View File

@ -22,6 +22,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.6 1999/07/25 15:12:06 armin
* fix of some debug logs.
* enabled ISA-cards option.
*
* Revision 1.5 1999/04/01 12:48:33 armin * Revision 1.5 1999/04/01 12:48:33 armin
* Changed some log outputs. * Changed some log outputs.
* *
@ -46,6 +50,7 @@
* *
*/ */
#include <linux/config.h>
#include "eicon.h" #include "eicon.h"
#include "eicon_isa.h" #include "eicon_isa.h"

4
drivers/isdn/eicon/eicon_pci.c
View File

@ -26,6 +26,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.9 1999/08/11 21:01:11 keil
* new PCI codefix
*
* Revision 1.8 1999/08/10 16:02:20 calle * Revision 1.8 1999/08/10 16:02:20 calle
* struct pci_dev changed in 2.3.13. Made the necessary changes. * struct pci_dev changed in 2.3.13. Made the necessary changes.
* *
@ -61,6 +64,7 @@
* *
*/ */
#include <linux/config.h>
#include <linux/pci.h> #include <linux/pci.h>
#include "eicon.h" #include "eicon.h"

4
drivers/isdn/hisax/bkm_a4t.c
View File

@ -7,6 +7,9 @@
* Author Roland Klabunde (R.Klabunde@Berkom.de) * Author Roland Klabunde (R.Klabunde@Berkom.de)
* *
* $Log$ * $Log$
* Revision 1.6 1999/08/11 21:01:22 keil
* new PCI codefix
*
* Revision 1.5 1999/08/10 16:01:46 calle * Revision 1.5 1999/08/10 16:01:46 calle
* struct pci_dev changed in 2.3.13. Made the necessary changes. * struct pci_dev changed in 2.3.13. Made the necessary changes.
* *
@ -25,6 +28,7 @@
#define __NO_VERSION__ #define __NO_VERSION__
#include <linux/config.h>
#include "hisax.h" #include "hisax.h"
#include "isac.h" #include "isac.h"
#include "hscx.h" #include "hscx.h"

4
drivers/isdn/hisax/bkm_a8.c
View File

@ -7,6 +7,9 @@
* Author Roland Klabunde (R.Klabunde@Berkom.de) * Author Roland Klabunde (R.Klabunde@Berkom.de)
* *
* $Log$ * $Log$
* Revision 1.6 1999/08/11 21:01:24 keil
* new PCI codefix
*
* Revision 1.5 1999/08/10 16:01:48 calle * Revision 1.5 1999/08/10 16:01:48 calle
* struct pci_dev changed in 2.3.13. Made the necessary changes. * struct pci_dev changed in 2.3.13. Made the necessary changes.
* *
@ -24,6 +27,7 @@
*/ */
#define __NO_VERSION__ #define __NO_VERSION__
#include <linux/config.h>
#include "hisax.h" #include "hisax.h"
#include "isac.h" #include "isac.h"
#include "ipac.h" #include "ipac.h"

4
drivers/isdn/hisax/callc.c
View File

@ -11,6 +11,9 @@
* Fritz Elfert * Fritz Elfert
* *
* $Log$ * $Log$
* Revision 2.31 1999/08/05 20:43:10 keil
* ISAR analog modem support
*
* Revision 2.30 1999/07/25 16:24:04 keil * Revision 2.30 1999/07/25 16:24:04 keil
* Fixed TEI now working again * Fixed TEI now working again
* *
@ -123,6 +126,7 @@
* *
*/ */
#include <linux/config.h>
#define __NO_VERSION__ #define __NO_VERSION__
#include "hisax.h" #include "hisax.h"
#include "../avmb1/capicmd.h" /* this should be moved in a common place */ #include "../avmb1/capicmd.h" /* this should be moved in a common place */

1
drivers/isdn/hisax/elsa_ser.c
View File

@ -1,3 +1,4 @@
#include <linux/config.h>
#include <linux/serial.h> #include <linux/serial.h>
#include <linux/serial_reg.h> #include <linux/serial_reg.h>

4
drivers/isdn/hisax/gazel.c
View File

@ -6,6 +6,9 @@
* based on source code from Karsten Keil * based on source code from Karsten Keil
* *
* $Log$ * $Log$
* Revision 2.5 1999/08/11 21:01:26 keil
* new PCI codefix
*
* Revision 2.4 1999/08/10 16:01:54 calle * Revision 2.4 1999/08/10 16:01:54 calle
* struct pci_dev changed in 2.3.13. Made the necessary changes. * struct pci_dev changed in 2.3.13. Made the necessary changes.
* *
@ -20,6 +23,7 @@
* Initial revision * Initial revision
* *
*/ */
#include <linux/config.h>
#define __NO_VERSION__ #define __NO_VERSION__
#include "hisax.h" #include "hisax.h"
#include "isac.h" #include "isac.h"

4
drivers/isdn/hisax/hfc_pci.c
View File

@ -23,6 +23,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.14 1999/08/12 18:59:45 werner
* Added further manufacturer and device ids to PCI list
*
* Revision 1.13 1999/08/11 21:01:28 keil * Revision 1.13 1999/08/11 21:01:28 keil
* new PCI codefix * new PCI codefix
* *
@ -67,6 +70,7 @@
* *
*/ */
#include <linux/config.h>
#define __NO_VERSION__ #define __NO_VERSION__
#include "hisax.h" #include "hisax.h"
#include "hfc_pci.h" #include "hfc_pci.h"

4
drivers/isdn/hisax/isdnl1.c
View File

@ -15,6 +15,9 @@
* *
* *
* $Log$ * $Log$
* Revision 2.34 1999/07/09 13:50:15 keil
* remove unused variable
*
* Revision 2.33 1999/07/09 13:34:33 keil * Revision 2.33 1999/07/09 13:34:33 keil
* remove debug code * remove debug code
* *
@ -129,7 +132,6 @@
const char *l1_revision = "$Revision$"; const char *l1_revision = "$Revision$";
#define __NO_VERSION__ #define __NO_VERSION__
#include <linux/config.h>
#include "hisax.h" #include "hisax.h"
#include "isdnl1.h" #include "isdnl1.h"

5
drivers/isdn/hisax/isurf.c
View File

@ -5,6 +5,10 @@
* Author Karsten Keil (keil@isdn4linux.de) * Author Karsten Keil (keil@isdn4linux.de)
* *
* $Log$ * $Log$
* Revision 1.3 1999/07/12 21:05:18 keil
* fix race in IRQ handling
* added watchdog for lost IRQs
*
* Revision 1.2 1999/07/01 08:07:56 keil * Revision 1.2 1999/07/01 08:07:56 keil
* Initial version * Initial version
* *
@ -13,7 +17,6 @@
*/ */
#define __NO_VERSION__ #define __NO_VERSION__
#include <linux/config.h>
#include "hisax.h" #include "hisax.h"
#include "isac.h" #include "isac.h"
#include "isar.h" #include "isar.h"

1
drivers/isdn/isdn_bsdcomp.c
View File

@ -64,7 +64,6 @@
#include <linux/malloc.h> #include <linux/malloc.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/sched.h> /* to get the struct task_struct */
#include <linux/string.h> /* used in new tty drivers */ #include <linux/string.h> /* used in new tty drivers */
#include <linux/signal.h> /* used in new tty drivers */ #include <linux/signal.h> /* used in new tty drivers */

7
drivers/isdn/isdn_concap.c
View File

@ -5,6 +5,9 @@
* another -- protocol specific -- source file. * another -- protocol specific -- source file.
* *
* $Log$ * $Log$
* Revision 1.5 1998/10/30 18:44:48 he
* pass return value from isdn_net_dial_req for dialmode change
*
* Revision 1.4 1998/10/30 17:55:24 he * Revision 1.4 1998/10/30 17:55:24 he
* dialmode for x25iface and multulink ppp * dialmode for x25iface and multulink ppp
* *
@ -50,7 +53,7 @@
int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb) int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb)
{ {
int tmp; int tmp;
struct device *ndev = concap -> net_dev; struct net_device *ndev = concap -> net_dev;
isdn_net_local *lp = (isdn_net_local *) ndev->priv; isdn_net_local *lp = (isdn_net_local *) ndev->priv;
IX25DEBUG( "isdn_concap_dl_data_req: %s \n", concap->net_dev->name); IX25DEBUG( "isdn_concap_dl_data_req: %s \n", concap->net_dev->name);
@ -63,7 +66,7 @@ int isdn_concap_dl_data_req(struct concap_proto *concap, struct sk_buff *skb)
int isdn_concap_dl_connect_req(struct concap_proto *concap) int isdn_concap_dl_connect_req(struct concap_proto *concap)
{ {
struct device *ndev = concap -> net_dev; struct net_device *ndev = concap -> net_dev;
isdn_net_local *lp = (isdn_net_local *) ndev->priv; isdn_net_local *lp = (isdn_net_local *) ndev->priv;
int ret; int ret;
IX25DEBUG( "isdn_concap_dl_connect_req: %s \n", ndev -> name); IX25DEBUG( "isdn_concap_dl_connect_req: %s \n", ndev -> name);

53
drivers/isdn/isdn_net.c
View File

@ -21,6 +21,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.88 1999/07/07 10:13:31 detabc
* remove unused messages
*
* Revision 1.87 1999/07/06 07:53:53 calle * Revision 1.87 1999/07/06 07:53:53 calle
* calls to dev_alloc_skb waste 16 bytes of memory, if we calculate the * calls to dev_alloc_skb waste 16 bytes of memory, if we calculate the
* right header space for the lowlevel driver. using alloc_skb instead. * right header space for the lowlevel driver. using alloc_skb instead.
@ -354,8 +357,8 @@
/* Prototypes */ /* Prototypes */
int isdn_net_force_dial_lp(isdn_net_local *); int isdn_net_force_dial_lp(isdn_net_local *);
static int isdn_net_start_xmit(struct sk_buff *, struct device *); static int isdn_net_start_xmit(struct sk_buff *, struct net_device *);
static int isdn_net_xmit(struct device *, isdn_net_local *, struct sk_buff *); static int isdn_net_xmit(struct net_device *, isdn_net_local *, struct sk_buff *);
char *isdn_net_revision = "$Revision$"; char *isdn_net_revision = "$Revision$";
@ -364,7 +367,7 @@ char *isdn_net_revision = "$Revision$";
*/ */
static void static void
isdn_net_unreachable(struct device *dev, struct sk_buff *skb, char *reason) isdn_net_unreachable(struct net_device *dev, struct sk_buff *skb, char *reason)
{ {
if(skb) { if(skb) {
@ -386,7 +389,7 @@ isdn_net_unreachable(struct device *dev, struct sk_buff *skb, char *reason)
} }
static void static void
isdn_net_reset(struct device *dev) isdn_net_reset(struct net_device *dev)
{ {
#ifdef CONFIG_ISDN_X25 #ifdef CONFIG_ISDN_X25
struct concap_device_ops * dops = struct concap_device_ops * dops =
@ -409,10 +412,10 @@ isdn_net_reset(struct device *dev)
/* Open/initialize the board. */ /* Open/initialize the board. */
static int static int
isdn_net_open(struct device *dev) isdn_net_open(struct net_device *dev)
{ {
int i; int i;
struct device *p; struct net_device *p;
struct in_device *in_dev; struct in_device *in_dev;
isdn_net_reset(dev); isdn_net_reset(dev);
@ -599,7 +602,7 @@ isdn_net_stat_callback(int idx, isdn_ctrl *c)
lp->stats.tx_packets++; lp->stats.tx_packets++;
lp->stats.tx_bytes += c->parm.length; lp->stats.tx_bytes += c->parm.length;
if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP && lp->sav_skb) { if (lp->p_encap == ISDN_NET_ENCAP_SYNCPPP && lp->sav_skb) {
struct device *mdev; struct net_device *mdev;
if (lp->master) if (lp->master)
mdev = lp->master; mdev = lp->master;
else else
@ -1043,7 +1046,7 @@ isdn_net_dial(void)
* Perform hangup for a net-interface. * Perform hangup for a net-interface.
*/ */
void void
isdn_net_hangup(struct device *d) isdn_net_hangup(struct net_device *d)
{ {
isdn_net_local *lp = (isdn_net_local *) d->priv; isdn_net_local *lp = (isdn_net_local *) d->priv;
isdn_ctrl cmd; isdn_ctrl cmd;
@ -1174,7 +1177,7 @@ isdn_net_log_skb(struct sk_buff * skb, isdn_net_local * lp)
* Side-effects: ndev->tbusy is cleared on success. * Side-effects: ndev->tbusy is cleared on success.
*/ */
int int
isdn_net_send_skb(struct device *ndev, isdn_net_local * lp, isdn_net_send_skb(struct net_device *ndev, isdn_net_local * lp,
struct sk_buff *skb) struct sk_buff *skb)
{ {
int ret; int ret;
@ -1207,7 +1210,7 @@ isdn_net_send_skb(struct device *ndev, isdn_net_local * lp,
*/ */
static int static int
isdn_net_xmit(struct device *ndev, isdn_net_local * lp, struct sk_buff *skb) isdn_net_xmit(struct net_device *ndev, isdn_net_local * lp, struct sk_buff *skb)
{ {
int ret; int ret;
@ -1263,7 +1266,7 @@ isdn_net_xmit(struct device *ndev, isdn_net_local * lp, struct sk_buff *skb)
} }
static void static void
isdn_net_adjust_hdr(struct sk_buff *skb, struct device *dev) isdn_net_adjust_hdr(struct sk_buff *skb, struct net_device *dev)
{ {
isdn_net_local *lp = (isdn_net_local *) dev->priv; isdn_net_local *lp = (isdn_net_local *) dev->priv;
if (!skb) if (!skb)
@ -1283,7 +1286,7 @@ isdn_net_adjust_hdr(struct sk_buff *skb, struct device *dev)
* and start dialing. * and start dialing.
*/ */
static int static int
isdn_net_start_xmit(struct sk_buff *skb, struct device *ndev) isdn_net_start_xmit(struct sk_buff *skb, struct net_device *ndev)
{ {
isdn_net_local *lp = (isdn_net_local *) ndev->priv; isdn_net_local *lp = (isdn_net_local *) ndev->priv;
#ifdef CONFIG_ISDN_X25 #ifdef CONFIG_ISDN_X25
@ -1435,9 +1438,9 @@ isdn_net_start_xmit(struct sk_buff *skb, struct device *ndev)
* Shutdown a net-interface. * Shutdown a net-interface.
*/ */
static int static int
isdn_net_close(struct device *dev) isdn_net_close(struct net_device *dev)
{ {
struct device *p; struct net_device *p;
#ifdef CONFIG_ISDN_X25 #ifdef CONFIG_ISDN_X25
struct concap_proto * cprot = struct concap_proto * cprot =
( (isdn_net_local *) dev->priv ) -> netdev -> cprot; ( (isdn_net_local *) dev->priv ) -> netdev -> cprot;
@ -1473,7 +1476,7 @@ isdn_net_close(struct device *dev)
* Get statistics * Get statistics
*/ */
static struct enet_statistics * static struct enet_statistics *
isdn_net_get_stats(struct device *dev) isdn_net_get_stats(struct net_device *dev)
{ {
isdn_net_local *lp = (isdn_net_local *) dev->priv; isdn_net_local *lp = (isdn_net_local *) dev->priv;
return &lp->stats; return &lp->stats;
@ -1489,7 +1492,7 @@ isdn_net_get_stats(struct device *dev)
*/ */
static unsigned short static unsigned short
isdn_net_type_trans(struct sk_buff *skb, struct device *dev) isdn_net_type_trans(struct sk_buff *skb, struct net_device *dev)
{ {
struct ethhdr *eth; struct ethhdr *eth;
unsigned char *rawp; unsigned char *rawp;
@ -1627,7 +1630,7 @@ isdn_net_slarp_out(void)
* Got a packet from ISDN-Channel. * Got a packet from ISDN-Channel.
*/ */
static void static void
isdn_net_receive(struct device *ndev, struct sk_buff *skb) isdn_net_receive(struct net_device *ndev, struct sk_buff *skb)
{ {
isdn_net_local *lp = (isdn_net_local *) ndev->priv; isdn_net_local *lp = (isdn_net_local *) ndev->priv;
isdn_net_local *olp = lp; /* original 'lp' */ isdn_net_local *olp = lp; /* original 'lp' */
@ -1776,7 +1779,7 @@ isdn_net_rcv_skb(int idx, struct sk_buff *skb)
} }
static int static int
my_eth_header(struct sk_buff *skb, struct device *dev, unsigned short type, my_eth_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
void *daddr, void *saddr, unsigned len) void *daddr, void *saddr, unsigned len)
{ {
struct ethhdr *eth = (struct ethhdr *) skb_push(skb, ETH_HLEN); struct ethhdr *eth = (struct ethhdr *) skb_push(skb, ETH_HLEN);
@ -1821,7 +1824,7 @@ my_eth_header(struct sk_buff *skb, struct device *dev, unsigned short type,
*/ */
static int static int
isdn_net_header(struct sk_buff *skb, struct device *dev, unsigned short type, isdn_net_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
void *daddr, void *saddr, unsigned plen) void *daddr, void *saddr, unsigned plen)
{ {
isdn_net_local *lp = dev->priv; isdn_net_local *lp = dev->priv;
@ -1877,7 +1880,7 @@ isdn_net_header(struct sk_buff *skb, struct device *dev, unsigned short type,
static int static int
isdn_net_rebuild_header(struct sk_buff *skb) isdn_net_rebuild_header(struct sk_buff *skb)
{ {
struct device *dev = skb->dev; struct net_device *dev = skb->dev;
isdn_net_local *lp = dev->priv; isdn_net_local *lp = dev->priv;
int ret = 0; int ret = 0;
@ -1909,7 +1912,7 @@ isdn_net_rebuild_header(struct sk_buff *skb)
* Interface-setup. (called just after registering a new interface) * Interface-setup. (called just after registering a new interface)
*/ */
static int static int
isdn_net_init(struct device *ndev) isdn_net_init(struct net_device *ndev)
{ {
ushort max_hlhdr_len = 0; ushort max_hlhdr_len = 0;
isdn_net_local *lp = (isdn_net_local *) ndev->priv; isdn_net_local *lp = (isdn_net_local *) ndev->priv;
@ -2420,7 +2423,7 @@ isdn_net_force_dial(char *name)
* Allocate a new network-interface and initialize its data structures. * Allocate a new network-interface and initialize its data structures.
*/ */
char * char *
isdn_net_new(char *name, struct device *master) isdn_net_new(char *name, struct net_device *master)
{ {
isdn_net_dev *netdev; isdn_net_dev *netdev;
@ -2449,8 +2452,8 @@ isdn_net_new(char *name, struct device *master)
netdev->local->p_encap = ISDN_NET_ENCAP_RAWIP; netdev->local->p_encap = ISDN_NET_ENCAP_RAWIP;
if (master) { if (master) {
/* Device shall be a slave */ /* Device shall be a slave */
struct device *p = (((isdn_net_local *) master->priv)->slave); struct net_device *p = (((isdn_net_local *) master->priv)->slave);
struct device *q = master; struct net_device *q = master;
netdev->local->master = master; netdev->local->master = master;
/* Put device at end of slave-chain */ /* Put device at end of slave-chain */
@ -2987,7 +2990,7 @@ int
isdn_net_force_hangup(char *name) isdn_net_force_hangup(char *name)
{ {
isdn_net_dev *p = isdn_net_findif(name); isdn_net_dev *p = isdn_net_findif(name);
struct device *q; struct net_device *q;
if (p) { if (p) {
if (p->local->isdn_device < 0) if (p->local->isdn_device < 0)

9
drivers/isdn/isdn_net.h
View File

@ -21,6 +21,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.9 1999/04/12 12:33:27 fritz
* Changes from 2.0 tree.
*
* Revision 1.8 1998/10/30 17:55:33 he * Revision 1.8 1998/10/30 17:55:33 he
* dialmode for x25iface and multulink ppp * dialmode for x25iface and multulink ppp
* *
@ -97,7 +100,7 @@ typedef struct cisco_slarp {
#define CISCO_SLARP_REQUEST 1 #define CISCO_SLARP_REQUEST 1
#define CISCO_SLARP_KEEPALIVE 2 #define CISCO_SLARP_KEEPALIVE 2
extern char *isdn_net_new(char *, struct device *); extern char *isdn_net_new(char *, struct net_device *);
extern char *isdn_net_newslave(char *); extern char *isdn_net_newslave(char *);
extern int isdn_net_rm(char *); extern int isdn_net_rm(char *);
extern int isdn_net_rmall(void); extern int isdn_net_rmall(void);
@ -109,13 +112,13 @@ extern int isdn_net_getphones(isdn_net_ioctl_phone *, char *);
extern int isdn_net_getpeer(isdn_net_ioctl_phone *, isdn_net_ioctl_phone *); extern int isdn_net_getpeer(isdn_net_ioctl_phone *, isdn_net_ioctl_phone *);
extern int isdn_net_delphone(isdn_net_ioctl_phone *); extern int isdn_net_delphone(isdn_net_ioctl_phone *);
extern int isdn_net_find_icall(int, int, int, setup_parm); extern int isdn_net_find_icall(int, int, int, setup_parm);
extern void isdn_net_hangup(struct device *); extern void isdn_net_hangup(struct net_device *);
extern void isdn_net_dial(void); extern void isdn_net_dial(void);
extern void isdn_net_autohup(void); extern void isdn_net_autohup(void);
extern int isdn_net_force_hangup(char *); extern int isdn_net_force_hangup(char *);
extern int isdn_net_force_dial(char *); extern int isdn_net_force_dial(char *);
extern isdn_net_dev *isdn_net_findif(char *); extern isdn_net_dev *isdn_net_findif(char *);
extern int isdn_net_send_skb(struct device *, isdn_net_local *, extern int isdn_net_send_skb(struct net_device *, isdn_net_local *,
struct sk_buff *); struct sk_buff *);
extern int isdn_net_rcv_skb(int, struct sk_buff *); extern int isdn_net_rcv_skb(int, struct sk_buff *);
extern void isdn_net_slarp_out(void); extern void isdn_net_slarp_out(void);

17
drivers/isdn/isdn_ppp.c
View File

@ -19,6 +19,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.51 1999/08/18 16:19:17 hipp
* applied MPPP-resize-headroom patch
*
* Revision 1.50 1999/08/16 07:11:41 hipp * Revision 1.50 1999/08/16 07:11:41 hipp
* Additional VJ decomp-buffer-size increased from 40 to 128 * Additional VJ decomp-buffer-size increased from 40 to 128
* *
@ -1290,7 +1293,7 @@ void isdn_ppp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buf
static void static void
isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff *skb, int proto) isdn_ppp_push_higher(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buff *skb, int proto)
{ {
struct device *dev = &net_dev->dev; struct net_device *dev = &net_dev->dev;
struct ippp_struct *is = ippp_table[lp->ppp_slot]; struct ippp_struct *is = ippp_table[lp->ppp_slot];
if (is->debug & 0x10) { if (is->debug & 0x10) {
@ -1443,9 +1446,9 @@ static unsigned char *isdn_ppp_skb_push(struct sk_buff **skb_p,int len)
*/ */
int int
isdn_ppp_xmit(struct sk_buff *skb, struct device *netdev) isdn_ppp_xmit(struct sk_buff *skb, struct net_device *netdev)
{ {
struct device *mdev = ((isdn_net_local *) (netdev->priv))->master; /* get master (for redundancy) */ struct net_device *mdev = ((isdn_net_local *) (netdev->priv))->master; /* get master (for redundancy) */
isdn_net_local *lp,*mlp; isdn_net_local *lp,*mlp;
isdn_net_dev *nd; isdn_net_dev *nd;
unsigned int proto = PPP_IP; /* 0x21 */ unsigned int proto = PPP_IP; /* 0x21 */
@ -2019,7 +2022,7 @@ isdn_ppp_timer_timeout(void)
*/ */
static int static int
isdn_ppp_dev_ioctl_stats(int slot, struct ifreq *ifr, struct device *dev) isdn_ppp_dev_ioctl_stats(int slot, struct ifreq *ifr, struct net_device *dev)
{ {
struct ppp_stats *res, struct ppp_stats *res,
t; t;
@ -2059,7 +2062,7 @@ isdn_ppp_dev_ioctl_stats(int slot, struct ifreq *ifr, struct device *dev)
} }
int int
isdn_ppp_dev_ioctl(struct device *dev, struct ifreq *ifr, int cmd) isdn_ppp_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{ {
int error=0; int error=0;
char *r; char *r;
@ -2122,7 +2125,7 @@ isdn_ppp_dial_slave(char *name)
#ifdef CONFIG_ISDN_MPP #ifdef CONFIG_ISDN_MPP
isdn_net_dev *ndev; isdn_net_dev *ndev;
isdn_net_local *lp; isdn_net_local *lp;
struct device *sdev; struct net_device *sdev;
if (!(ndev = isdn_net_findif(name))) if (!(ndev = isdn_net_findif(name)))
return 1; return 1;
@ -2153,7 +2156,7 @@ isdn_ppp_hangup_slave(char *name)
#ifdef CONFIG_ISDN_MPP #ifdef CONFIG_ISDN_MPP
isdn_net_dev *ndev; isdn_net_dev *ndev;
isdn_net_local *lp; isdn_net_local *lp;
struct device *sdev; struct net_device *sdev;
if (!(ndev = isdn_net_findif(name))) if (!(ndev = isdn_net_findif(name)))
return 1; return 1;

7
drivers/isdn/isdn_ppp.h
View File

@ -19,6 +19,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.13 1998/03/22 18:50:50 hipp
* Added BSD Compression for syncPPP .. UNTESTED at the moment
*
* Revision 1.12 1998/01/31 22:07:48 keil * Revision 1.12 1998/01/31 22:07:48 keil
* changes for newer kernels * changes for newer kernels
* *
@ -75,9 +78,9 @@ extern int isdn_ppp_init(void);
extern void isdn_ppp_cleanup(void); extern void isdn_ppp_cleanup(void);
extern int isdn_ppp_free(isdn_net_local *); extern int isdn_ppp_free(isdn_net_local *);
extern int isdn_ppp_bind(isdn_net_local *); extern int isdn_ppp_bind(isdn_net_local *);
extern int isdn_ppp_xmit(struct sk_buff *, struct device *); extern int isdn_ppp_xmit(struct sk_buff *, struct net_device *);
extern void isdn_ppp_receive(isdn_net_dev *, isdn_net_local *, struct sk_buff *); extern void isdn_ppp_receive(isdn_net_dev *, isdn_net_local *, struct sk_buff *);
extern int isdn_ppp_dev_ioctl(struct device *, struct ifreq *, int); extern int isdn_ppp_dev_ioctl(struct net_device *, struct ifreq *, int);
extern unsigned int isdn_ppp_poll(struct file *, struct poll_table_struct *); extern unsigned int isdn_ppp_poll(struct file *, struct poll_table_struct *);
extern int isdn_ppp_ioctl(int, struct file *, unsigned int, unsigned long); extern int isdn_ppp_ioctl(int, struct file *, unsigned int, unsigned long);
extern void isdn_ppp_release(int, struct file *); extern void isdn_ppp_release(int, struct file *);

4
drivers/isdn/isdn_tty.h
View File

@ -20,6 +20,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.15 1999/07/31 12:59:48 armin
* Added tty fax capabilities.
*
* Revision 1.14 1999/07/11 17:14:15 armin * Revision 1.14 1999/07/11 17:14:15 armin
* Added new layer 2 and 3 protocols for Fax and DSP functions. * Added new layer 2 and 3 protocols for Fax and DSP functions.
* Moved "Add CPN to RING message" to new register S23, * Moved "Add CPN to RING message" to new register S23,
@ -83,6 +86,7 @@
* *
*/ */
#include <linux/config.h>
#define DLE 0x10 #define DLE 0x10
#define ETX 0x03 #define ETX 0x03

4
drivers/isdn/isdn_ttyfax.c
View File

@ -20,6 +20,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Log$ * $Log$
* Revision 1.2 1999/08/05 10:36:10 armin
* Bugfix: kernel oops on getting revision.
*
* Revision 1.1 1999/07/31 12:59:50 armin * Revision 1.1 1999/07/31 12:59:50 armin
* Added tty fax capabilities. * Added tty fax capabilities.
* *
@ -30,7 +33,6 @@
#undef ISDN_TTY_FAX_CMD_DEBUG #undef ISDN_TTY_FAX_CMD_DEBUG
#define __NO_VERSION__ #define __NO_VERSION__
#include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/isdn.h> #include <linux/isdn.h>
#include "isdn_common.h" #include "isdn_common.h"

7
drivers/isdn/isdn_x25iface.c
View File

@ -10,6 +10,9 @@
* goes to another -- device related -- concap_proto support source file. * goes to another -- device related -- concap_proto support source file.
* *
* $Log$ * $Log$
* Revision 1.6 1999/01/27 22:53:19 he
* minor updates (spellings, jiffies wrap around in isdn_tty)
*
* Revision 1.5 1998/10/30 17:55:39 he * Revision 1.5 1998/10/30 17:55:39 he
* dialmode for x25iface and multulink ppp * dialmode for x25iface and multulink ppp
* *
@ -54,7 +57,7 @@ typedef struct isdn_x25iface_proto_data {
void isdn_x25iface_proto_del( struct concap_proto * ); void isdn_x25iface_proto_del( struct concap_proto * );
int isdn_x25iface_proto_close( struct concap_proto * ); int isdn_x25iface_proto_close( struct concap_proto * );
int isdn_x25iface_proto_restart( struct concap_proto *, int isdn_x25iface_proto_restart( struct concap_proto *,
struct device *, struct net_device *,
struct concap_device_ops *); struct concap_device_ops *);
int isdn_x25iface_xmit( struct concap_proto *, struct sk_buff * ); int isdn_x25iface_xmit( struct concap_proto *, struct sk_buff * );
int isdn_x25iface_receive( struct concap_proto *, struct sk_buff * ); int isdn_x25iface_receive( struct concap_proto *, struct sk_buff * );
@ -172,7 +175,7 @@ void isdn_x25iface_proto_del(struct concap_proto *cprot){
/* (re-)initialize the data structures for x25iface encapsulation /* (re-)initialize the data structures for x25iface encapsulation
*/ */
int isdn_x25iface_proto_restart(struct concap_proto *cprot, int isdn_x25iface_proto_restart(struct concap_proto *cprot,
struct device *ndev, struct net_device *ndev,
struct concap_device_ops *dops) struct concap_device_ops *dops)
{ {
ix25_pdata_t * pda = cprot -> proto_data ; ix25_pdata_t * pda = cprot -> proto_data ;

4
include/linux/isdn_compat.h
View File

@ -104,5 +104,9 @@ static inline unsigned long copy_to_user(void *to, const void *from, unsigned lo
#define COMPAT_HAS_NEW_WAITQ #define COMPAT_HAS_NEW_WAITQ
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,14)
#define net_device device
#endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _LINUX_ISDN_COMPAT_H */ #endif /* _LINUX_ISDN_COMPAT_H */