openbsc: don't modify the MNCC version anymore

3 files changed, 1 insertions, 38 deletions

diff --git a/recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch b/recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch
deleted file mode 100644
index c4c2ee8..0000000
--- a/recipes-osmocom/openbsc/openbsc/revert-mncc-version.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-OpenBSC has bumped the version from 2 to 4 but only introduced
-new defines so the actual wire protocol has not been changed
-yet. This is why we can just turn the version back. At least I
-hope so.
-
-
-Index: openbsc/include/openbsc/mncc.h
-===================================================================
---- openbsc.orig/include/openbsc/mncc.h
-+++ openbsc/include/openbsc/mncc.h
-@@ -163,7 +163,7 @@ struct gsm_data_frame {
- 	unsigned char	data[0];
- };
- 
--#define MNCC_SOCK_VERSION	4
-+#define MNCC_SOCK_VERSION	2
- struct gsm_mncc_hello {
- 	uint32_t	msg_type;
- 	uint32_t	version;
diff --git a/recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch b/recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch
deleted file mode 100644
index b856cc3..0000000
--- a/recipes-osmocom/openbsc/openbsc/upgrade-mncc-version.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-lcr uses MNCC_SOCK_VERSION 5, but this is binary compatible to
-what openbsc thinks is version 4.  The only difference is the added
-RTP related commands, which are optional.
-
-Index: openbsc/include/openbsc/mncc.h
-===================================================================
---- openbsc.orig/include/openbsc/mncc.h
-+++ openbsc/include/openbsc/mncc.h
-@@ -163,7 +163,7 @@ struct gsm_data_frame {
- 	unsigned char	data[0];
- };
- 
--#define MNCC_SOCK_VERSION	4
-+#define MNCC_SOCK_VERSION	5
- struct gsm_mncc_hello {
- 	uint32_t	msg_type;
- 	uint32_t	version;
diff --git a/recipes-osmocom/openbsc/openbsc_git.bb b/recipes-osmocom/openbsc/openbsc_git.bb
index a88e081..ab0a6c2 100644
--- a/recipes-osmocom/openbsc/openbsc_git.bb
+++ b/recipes-osmocom/openbsc/openbsc_git.bb
@@ -5,7 +5,6 @@ PRINC = "0"
 PR = "${INC_PR}.1"
 
 SRCREV = "3c820ee532021a89aca96d1a52ecb463ccc07d03"
-SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git \
-    file://upgrade-mncc-version.patch"
+SRC_URI += "git://git.osmocom.org/openbsc.git;protocol=git"
 
 S = "${WORKDIR}/git/openbsc"