layer2: rename files to remove extra osmocom_ prefix

src/host/layer2/include/osmocom/Makefile.am

@@ -1,3 +1,3 @@
 # headers from OpenBSC
 noinst_HEADERS = debug.h
-noinst_HEADERS += osmocom_layer2.h osmocom_data.h lapdm.h rslms.h layer3.h
+noinst_HEADERS += layer2.h osmocom_data.h lapdm.h rslms.h layer3.h

src/host/layer2/src/Makefile.am

@@ -5,5 +5,5 @@ noinst_LIBRARIES = libosmocom.a
 libosmocom_a_SOURCES = libosmocom/debug.c 
 
 sbin_PROGRAMS = layer2
-layer2_SOURCES = layer2_main.c osmocom_layer2.c gsmtap_util.c lapdm.c osmocom_rslms.c layer3.c
+layer2_SOURCES = layer2_main.c layer2.c gsmtap_util.c lapdm.c rslms.c layer3.c
 layer2_LDADD = libosmocom.a $(LIBOSMOCORE_LIBS)

src/host/layer2/src/gsmtap_util.c

@@ -20,7 +20,7 @@
  *
  */
 
-#include <osmocom/osmocom_layer2.h>
+#include <osmocom/layer2.h>
 #include <osmocom/osmocom_data.h>
 #include <osmocom/debug.h>
 #include <osmocore/protocol/gsm_04_08.h>

src/host/layer2/src/lapdm.c

@@ -34,7 +34,7 @@
 
 #include <osmocom/debug.h>
 #include <osmocom/osmocom_data.h>
-#include <osmocom/osmocom_layer2.h>
+#include <osmocom/layer2.h>
 #include <osmocom/lapdm.h>
 
 #include <l1a_l23_interface.h>

src/host/layer2/src/layer2.c

@@ -33,7 +33,7 @@
 #include <osmocore/protocol/gsm_04_08.h>
 #include <osmocore/protocol/gsm_08_58.h>
 
-#include <osmocom/osmocom_layer2.h>
+#include <osmocom/layer2.h>
 #include <osmocom/osmocom_data.h>
 #include <osmocom/lapdm.h>
 #include <osmocom/debug.h>

src/host/layer2/src/layer2_main.c

@@ -21,7 +21,7 @@
  */
 
 #include <osmocom/osmocom_data.h>
-#include <osmocom/osmocom_layer2.h>
+#include <osmocom/layer2.h>
 #include <osmocom/lapdm.h>
 
 #include <osmocom/debug.h>

src/host/layer2/src/rslms.c

@@ -12,7 +12,7 @@
 #include <osmocom/rslms.h>
 #include <osmocom/layer3.h>
 #include <osmocom/osmocom_data.h>
-#include <osmocom/osmocom_layer2.h>
+#include <osmocom/layer2.h>
 
 int rsl_dec_chan_nr(uint8_t chan_nr, uint8_t *type, uint8_t *subch, uint8_t *timeslot)
 {