commit dbd82fb5b1e0fc180a680094b80d6799bd28725a
author Pablo Neira Ayuso <pablo@gnumonks.org> Tue Jul 05 15:29:23 2011 +0200
committer Pablo Neira Ayuso <pablo@gnumonks.org> Tue Jul 05 15:29:23 2011 +0200
tree 8c0c3025f38ec51ed1096d33fc033afa3276600e
parent add3ec84779ca1f9c7dd64aa8bb8641e8f15637a

e1_input: change prototype of ->sign_link(...)

This patch removes the struct e1inp_sign_link parameter since this
is already available in the msgb->dst field of the message.

include/osmocom/abis/e1_input.h

diff --git a/include/osmocom/abis/e1_input.h b/include/osmocom/abis/e1_input.h
index 312e781..4339e05 100644
--- a/include/osmocom/abis/e1_input.h
+++ b/include/osmocom/abis/e1_input.h
@@ -127,7 +127,7 @@
 
 	struct e1inp_sign_link *	(*sign_link_up)(void *unit_info, struct e1inp_line *line, enum e1inp_sign_type type);
 	void	(*sign_link_down)(struct e1inp_line *line);
-	int	(*sign_link)(struct msgb *msg, struct e1inp_sign_link *link);
+	int	(*sign_link)(struct msgb *msg);
 };
 
 struct e1inp_line {

src/e1_input.c

diff --git a/src/e1_input.c b/src/e1_input.c
index 77a6b3c..c83dc04 100644
--- a/src/e1_input.c
+++ b/src/e1_input.c
@@ -457,7 +457,8 @@
 				"no action set for signalling messages.\n");
 			return -ENOENT;
 		}
-		ts->line->ops->sign_link(msg, link);
+		msg->dst = link;
+		ts->line->ops->sign_link(msg);
 		break;
 	case E1INP_TS_TYPE_TRAU:
 		ret = subch_demux_in(&ts->trau.demux, msg->l2h, msgb_l2len(msg));

src/input/hsl.c

diff --git a/src/input/hsl.c b/src/input/hsl.c
index aa79cdf..d8eb8db 100644
--- a/src/input/hsl.c
+++ b/src/input/hsl.c
@@ -186,7 +186,7 @@
 			"no action set for signalling messages.\n");
 		return -ENOENT;
 	}
-	e1i_ts->line->ops->sign_link(msg, link);
+	e1i_ts->line->ops->sign_link(msg);
 
 	return ret;
 }

src/input/ipaccess.c

diff --git a/src/input/ipaccess.c b/src/input/ipaccess.c
index 0192b2b..ec4b231 100644
--- a/src/input/ipaccess.c
+++ b/src/input/ipaccess.c
@@ -386,7 +386,7 @@
 			"no action set for signalling messages.\n");
 		return -ENOENT;
 	}
-	e1i_ts->line->ops->sign_link(msg, link);
+	e1i_ts->line->ops->sign_link(msg);
 
 	return ret;
 }
@@ -782,7 +782,7 @@
 			"no action set for signalling messages.\n");
 		return -ENOENT;
 	}
-	link->line->ops->sign_link(msg, sign_link);
+	link->line->ops->sign_link(msg);
 	return 0;
 }
 

tests/e1inp_ipa_bsc_test.c

diff --git a/tests/e1inp_ipa_bsc_test.c b/tests/e1inp_ipa_bsc_test.c
index a65b375..0d04d59 100644
--- a/tests/e1inp_ipa_bsc_test.c
+++ b/tests/e1inp_ipa_bsc_test.c
@@ -55,7 +55,7 @@
 	e1inp_sign_link_destroy(rsl_sign_link);
 }
 
-static int sign_link(struct msgb *msg, struct e1inp_sign_link *link)
+static int sign_link(struct msgb *msg)
 {
 	LOGP(DBSCTEST, LOGL_NOTICE, "OML/RSL message received.\n");
 	return 0;

tests/e1inp_ipa_bts_test.c

diff --git a/tests/e1inp_ipa_bts_test.c b/tests/e1inp_ipa_bts_test.c
index 8ba49c5..bd67a83 100644
--- a/tests/e1inp_ipa_bts_test.c
+++ b/tests/e1inp_ipa_bts_test.c
@@ -77,7 +77,7 @@
 	e1inp_sign_link_destroy(rsl_sign_link);
 }
 
-static int sign_link(struct msgb *msg, struct e1inp_sign_link *link)
+static int sign_link(struct msgb *msg)
 {
 	LOGP(DBTSTEST, LOGL_NOTICE, "OML/RSL message received.\n");
 	return 0;