patch-2.3.18 linux/net/atm/proc.c

Next file: linux/net/atm/pvc.c
Previous file: linux/net/atm/mpc.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.17/linux/net/atm/proc.c linux/net/atm/proc.c
@@ -38,11 +38,6 @@
 #include "common.h" /* atm_proc_init prototype */
 #include "signaling.h" /* to get sigd - ugly too */
 
-#ifdef CONFIG_AREQUIPA
-#include <linux/arequipa.h>
-void atm_push_arequipa(struct atm_vcc *vcc,struct sk_buff *skb);
-#endif
-
 #ifdef CONFIG_ATM_CLIP
 #include <net/atmclip.h>
 #include "ipcommon.h"
@@ -111,9 +106,6 @@
 #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
 ENTRY(lec);
 #endif
-#ifdef CONFIG_AREQUIPA
-ENTRY(arequipa);
-#endif
 
 
 static int atm_header(ino_t ino,char *buf)
@@ -137,10 +129,6 @@
 		    "                          Status            Flags "
 		    "VPI/VCI Recv VPI/VCI\n");
 #endif
-#ifdef CONFIG_AREQUIPA
-	if (ino == INO(arequipa))
-		return sprintf(buf,"Itf VPI VCI   State    Sock# Inode\n");
-#endif
 	return -EINVAL;
 }
 
@@ -300,37 +288,6 @@
 }
 
 
-#ifdef CONFIG_AREQUIPA
-
-
-static const char *arequipa_state(const struct atm_vcc *vcc)
-{
-	if (!(vcc->flags & ATM_VF_REGIS) && vcc->family != PF_ATMPVC)
-		return "DOOMED";
-	if (vcc->upper) return "ATTACHED";
-	return "DANGLING";
-}
-
-
-static void arequipa_info(struct atm_vcc *vcc,char *buf)
-{
-	char *here;
- 
-	if (!vcc->dev) sprintf(buf,"Unassigned    ");
-	else sprintf(buf,"%3d %3d %5d ",vcc->dev->number,vcc->vpi,vcc->vci);
-        here = strchr(buf,0);
-        here += sprintf(here,"%-8s ",arequipa_state(vcc));
-	if (vcc->upper)
-		here += sprintf(here,"%5d %ld",vcc->upper->num,
-		    vcc->upper->socket && SOCK_INODE(vcc->upper->socket) ?
-		    SOCK_INODE(vcc->upper->socket)->i_ino : 0);
-	strcat(here,"\n");
-}
-
-
-#endif
-
-
 #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
 
 static char*
@@ -458,18 +415,6 @@
 		return 0;
 	}
 #endif
-#ifdef CONFIG_AREQUIPA
-	if (ino == INO(arequipa)) {
-		left = *pos-1;
-		for (dev = atm_devs; dev; dev = dev->next)
-			for (vcc = dev->vccs; vcc; vcc = vcc->next)
-				if (vcc->push == atm_push_arequipa && !left--) {
-					arequipa_info(vcc,buf);
-					return strlen(buf);
-				}
-		return 0;
-	}
-#endif
 #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
 	if (ino == INO(lec)) {
 		struct lec_priv *priv;
@@ -609,9 +554,6 @@
 #endif
 #if defined(CONFIG_ATM_LANE) || defined(CONFIG_ATM_LANE_MODULE)
 	REG(lec);
-#endif
-#ifdef CONFIG_AREQUIPA
-	REG(arequipa);
 #endif
 	return error;
 }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)