diff -urN linux.old/include/linux/atmdev.h linux.dev/include/linux/atmdev.h --- linux.old/include/linux/atmdev.h 2005-08-22 23:18:37.812526104 +0200 +++ linux.dev/include/linux/atmdev.h 2005-08-23 06:33:33.425389944 +0200 @@ -30,6 +30,9 @@ #define ATM_DS3_PCR (8000*12) /* DS3: 12 cells in a 125 usec time slot */ +#define ATM_PDU_OVHD 0 /* number of bytes to charge against buffer + quota per PDU */ + #define ATM_SD(s) ((s)->sk->protinfo.af_atm) @@ -94,7 +97,8 @@ /* set backend handler */ #define ATM_NEWBACKENDIF _IOW('a',ATMIOC_SPECIAL+3,atm_backend_t) /* use backend to make new if */ - +#define ATM_STOPTX _IOW('a',ATMIOC_SPECIAL+4,struct atmif_sioc) + /* Stop Tx on Sangam DSL */ /* * These are backend handkers that can be set via the ATM_SETBACKEND call * above. In the future we may support dynamic loading of these - for now, @@ -199,7 +203,9 @@ "SESSION", "HASSAP", "BOUND", "CLOSE" -#ifdef __KERNEL__ +#ifndef __KERNEL__ +#undef __AAL_STAT_ITEMS +#else #include /* wait_queue_head_t */ #include /* struct timeval */ @@ -291,6 +297,7 @@ int (*send)(struct atm_vcc *vcc,struct sk_buff *skb); void *dev_data; /* per-device data */ void *proto_data; /* per-protocol data */ + struct timeval timestamp; /* AAL timestamps */ struct k_atm_aal_stats *stats; /* pointer to AAL stats group */ wait_queue_head_t sleep; /* if socket is busy */ struct sock *sk; /* socket backpointer */ @@ -333,13 +340,14 @@ struct k_atm_dev_stats stats; /* statistics */ char signal; /* signal status (ATM_PHY_SIG_*) */ int link_rate; /* link rate (default: OC3) */ - atomic_t refcnt; /* reference count */ - spinlock_t lock; /* protect internal members */ + atomic_t refcnt; /* reference count */ + spinlock_t lock; /* protect internal members */ #ifdef CONFIG_PROC_FS struct proc_dir_entry *proc_entry; /* proc entry */ char *proc_name; /* proc entry name */ #endif - struct list_head dev_list; /* linkage */ + struct list_head dev_list; /* linkage */ + };