diff --git a/include/openbsc/debug.h b/include/openbsc/debug.h
index ec9cbbb..626bcf5 100644
--- a/include/openbsc/debug.h
+++ b/include/openbsc/debug.h
@@ -16,6 +16,7 @@
 #define DMI		0x1000
 #define DMIB		0x2000
 #define DMUX		0x4000
+#define DINP		0x8000
 
 #ifdef DEBUG
 #define DEBUGP(ss, fmt, args...) debugp(ss, __FILE__, __LINE__, 0, fmt, ## args)
diff --git a/include/openbsc/e1_input.h b/include/openbsc/e1_input.h
index 8b9521d..6d5a0be 100644
--- a/include/openbsc/e1_input.h
+++ b/include/openbsc/e1_input.h
@@ -147,9 +147,8 @@
 
 /* e1_config.c */
 int e1_config(struct gsm_bts *bts, int cardnr, int release_l2);
-int ia_config(struct gsm_bts *bts);
 int ia_config_connect(struct gsm_bts *bts, struct sockaddr_in *sin);
-int ipaccess_setup(struct e1inp_line *line);
+int ipaccess_setup(struct gsm_network *gsmnet);
 
 struct llist_head e1inp_driver_list;
 struct llist_head e1inp_line_list;
diff --git a/include/openbsc/gsm_data.h b/include/openbsc/gsm_data.h
index 6c08b03..8ad127a 100644
--- a/include/openbsc/gsm_data.h
+++ b/include/openbsc/gsm_data.h
@@ -296,6 +296,12 @@
 	struct {
 		struct gsm_nm_state nm_state;
 	} site_mgr;
+
+	/* ip.accesss Unit ID's have Site/BTS/TRX layout */
+	struct {
+		u_int16_t site_id;
+		u_int16_t bts_id;
+	} ip_access;
 	
 	/* transceivers */
 	int num_trx;