diff -ur --new-file old/linux/include/linux/atm.h new/linux/include/linux/atm.h
--- old/linux/include/linux/atm.h	Mon Sep  2 19:26:22 1996
+++ new/linux/include/linux/atm.h	Mon Sep  2 19:26:58 1996
@@ -203,14 +203,6 @@
 
 #define SIOCSIFATMTCP	_IO('a',ATMIOC_ITF)	/* set ATMTCP mode */
 
-/*
- * The following ioctls are obsolete and will be removed in a later release
- */
-
-#define SIOCGIFATMADDR	_IOR('a',ATMIOC_ITF+1,struct atmif_sioc)
-					/* get local ATM address */
-#define SIOCSIFATMADDR	_IOR('a',ATMIOC_ITF+2,struct atmif_sioc)
-					/* set local ATM address */
 
 #ifdef __KERNEL__
 
diff -ur --new-file old/linux/net/atm/common.c new/linux/net/atm/common.c
--- old/linux/net/atm/common.c	Mon Sep  2 19:26:23 1996
+++ new/linux/net/atm/common.c	Mon Sep  2 19:26:59 1996
@@ -155,8 +155,8 @@
 {
 	int max_sdu;
 
-	if (!tp->class) return 0;
-	if (tp->class != ATM_UBR && !tp->min_pcr && !tp->max_pcr)
+	if (!tp->traffic_class) return 0;
+	if (tp->traffic_class != ATM_UBR && !tp->min_pcr && !tp->max_pcr)
 		return -EINVAL;
 	switch (aal) {
 		case ATM_AAL0:
@@ -270,7 +270,7 @@
 	DPRINTK("VCC %d.%d, AAL %d\n",vpi,vci,vcc->aal);
 	DPRINTK("  TX: %d, PCR %d..%d, SDU %d\n",vcc->qos.txtp.traffic_class,
 	    vcc->qos.txtp.min_pcr,vcc->qos.txtp.max_pcr,vcc->qos.txtp.max_sdu);
-	DPRINTK("  RX: %d, PCR %d..%d, SDU %d\n",vcc->qos.rxtp.class,
+	DPRINTK("  RX: %d, PCR %d..%d, SDU %d\n",vcc->qos.rxtp.traffic_class,
 	    vcc->qos.rxtp.min_pcr,vcc->qos.rxtp.max_pcr,vcc->qos.rxtp.max_sdu);
 	if (dev->ops->open) {
 		error = dev->ops->open(vcc,vpi,vci);
diff -ur --new-file old/linux/net/atm/ipcommon.c new/linux/net/atm/ipcommon.c
--- old/linux/net/atm/ipcommon.c	Mon Sep  2 19:26:23 1996
+++ new/linux/net/atm/ipcommon.c	Mon Sep  2 19:26:59 1996
@@ -95,7 +95,7 @@
  
 void atm_pop_clip(struct atm_vcc *vcc,struct sk_buff *skb)
 {
-#ifdef CONFIG_MMU_HACKS
+#if 0 && defined(CONFIG_MMU_HACKS)
 	if (skb->atm.iovcnt)
 		unlock_user(skb->atm.iovcnt-1,(struct iovec *) skb->data+1);
 #endif
diff -ur --new-file old/linux/net/atm/svc.c new/linux/net/atm/svc.c
--- old/linux/net/atm/svc.c	Mon Sep  2 19:26:23 1996
+++ new/linux/net/atm/svc.c	Mon Sep  2 19:26:59 1996
@@ -484,10 +484,6 @@
 
 	rsize = wsize = 0;
 	switch (cmd) {
-		case SIOCGIFATMADDR:
-			wsize = sizeof(struct sockaddr_atmsvc);
-			break;
-		case SIOCSIFATMADDR:
 		case ATM_ADDADDR:
 		case ATM_DELADDR:
 			rsize = sizeof(struct sockaddr_atmsvc);
@@ -512,7 +508,6 @@
 	    number)))) return -ENODEV;
 	len = get_fs_long(&((struct atmif_sioc *) arg)->length);
 	buf = (void *) get_fs_long(&((struct atmif_sioc *) arg)->arg);
-	if (cmd == SIOCSIFATMADDR && !buf) rsize = 0; /* @@@ */
 	if (!buf && (rsize || wsize)) return -EINVAL;
 	if (rsize > 0) {
 		if (len != rsize) return -EINVAL;
@@ -526,24 +521,9 @@
 		put_fs_long(wsize,&((struct atmif_sioc *) arg)->length);
 	}
 	switch (cmd) {
-		case SIOCGIFATMADDR:
-			{
-				struct sockaddr_atmsvc addr;
-
-				memset(&addr,0,sizeof(addr));
-				memcpy_tofs((struct sockaddr_atmsvc *) buf,
-				    dev->local ? &dev->local->addr : &addr,
-				    sizeof(struct sockaddr_atmsvc));
-				return wsize;
-			}
 		case ATM_RSTADDR:
 			reset_addr(dev);
 			return 0;
-		case SIOCSIFATMADDR: /* OBSOLETE - REMOVE WHEN ILMID UPDATED */
-			reset_addr(dev);
-			if (!buf) return 0;
-			cmd = ATM_ADDADDR;
-			/* fall through */
 		case ATM_ADDADDR:
 		case ATM_DELADDR:
 			{

.