mtp: Rename mtp_link to mtp_link_set as this is the linkset

The link_udp is actually below the linkset. We need to get this
right now and then can have multiple links.

4 files changed, 17 insertions, 17 deletions

diff --git a/include/bsc_data.h b/include/bsc_data.h
index 32fc94f..48ce137 100644
--- a/include/bsc_data.h
+++ b/include/bsc_data.h
@@ -59,7 +59,7 @@ struct link_data {
 
 	int pcap_fd;
 	struct bsc_data *bsc;
-	struct mtp_link *the_link;
+	struct mtp_link_set *the_link;
 
 	struct timer_list link_activate;
 	int forced_down;
@@ -138,7 +138,7 @@ void msc_send_direct(struct bsc_data *bsc, struct msgb *msg);
 void msc_close_connection(struct bsc_data *data);
 
 /* connection tracking and action */
-void update_con_state(struct mtp_link *link, int rc, struct sccp_parse_result *result, struct msgb *msg, int from_msc, int sls);
+void update_con_state(struct mtp_link_set *link, int rc, struct sccp_parse_result *result, struct msgb *msg, int from_msc, int sls);
 unsigned int sls_for_src_ref(struct sccp_source_reference *ref);
 
 /* udp init */
diff --git a/include/bsc_sccp.h b/include/bsc_sccp.h
index c75bab6..8811a2b 100644
--- a/include/bsc_sccp.h
+++ b/include/bsc_sccp.h
@@ -54,7 +54,7 @@ struct active_sccp_con {
 	unsigned int rls_tries;
 
 	/* MTP link this was coming in */
-	struct mtp_link *link;
+	struct mtp_link_set *link;
 
 	/* sls id */
 	int sls;
diff --git a/include/isup_types.h b/include/isup_types.h
index be7964d..5347cb4 100644
--- a/include/isup_types.h
+++ b/include/isup_types.h
@@ -25,7 +25,7 @@
 #include <endian.h>
 
 struct msgb;
-struct mtp_link;
+struct mtp_link_set;
 
 /* This is from Table 4/Q.763 */
 #define ISUP_MSG_GRS	0x17
@@ -47,7 +47,7 @@ struct isup_msg_grs {
 	uint8_t  pointer_int;
 };
 
-int mtp_link_forward_isup(struct mtp_link *link, struct msgb *msg, int sls);
+int mtp_link_set_forward_isup(struct mtp_link_set *link, struct msgb *msg, int sls);
 
 int isup_parse_grs(const uint8_t *data, uint8_t length);
 
diff --git a/include/mtp_data.h b/include/mtp_data.h
index 5168eb1..c2bf841 100644
--- a/include/mtp_data.h
+++ b/include/mtp_data.h
@@ -34,7 +34,7 @@
 /**
  * The state of the mtp_link in terms of layer3 and upwards
  */
-struct mtp_link {
+struct mtp_link_set {
 	/* routing info.. */
 	int dpc, opc, sccp_opc;
 	int ni;
@@ -63,21 +63,21 @@ struct mtp_link {
 };
 
 
-struct mtp_link *mtp_link_alloc(void);
-void mtp_link_stop(struct mtp_link *link);
-void mtp_link_reset(struct mtp_link *link);
-int mtp_link_data(struct mtp_link *link, struct msgb *msg);
-int mtp_link_submit_sccp_data(struct mtp_link *link, int sls, const uint8_t *data, unsigned int length);
-int mtp_link_submit_isup_data(struct mtp_link *link, int sls, const uint8_t *data, unsigned int length);
+struct mtp_link_set *mtp_link_set_alloc(void);
+void mtp_link_set_stop(struct mtp_link_set *link);
+void mtp_link_set_reset(struct mtp_link_set *link);
+int mtp_link_set_data(struct mtp_link_set *link, struct msgb *msg);
+int mtp_link_set_submit_sccp_data(struct mtp_link_set *link, int sls, const uint8_t *data, unsigned int length);
+int mtp_link_set_submit_isup_data(struct mtp_link_set *link, int sls, const uint8_t *data, unsigned int length);
 
 
 /* one time init function */
-void mtp_link_init(void);
+void mtp_link_set_init(void);
 
 /* to be implemented for MSU sending */
-void mtp_link_submit(struct mtp_link *link, struct msgb *msg);
-void mtp_link_forward_sccp(struct mtp_link *link, struct msgb *msg, int sls);
-void mtp_link_restart(struct mtp_link *link);
-void mtp_link_sccp_down(struct mtp_link *link);
+void mtp_link_set_submit(struct mtp_link_set *link, struct msgb *msg);
+void mtp_link_set_forward_sccp(struct mtp_link_set *link, struct msgb *msg, int sls);
+void mtp_link_set_restart(struct mtp_link_set *link);
+void mtp_link_set_sccp_down(struct mtp_link_set *link);
 
 #endif