[PATCH] libosmo-netif[master]: netif/ipa.h: Don't redefine 'struct ipaccess_unit' from libo...

[Harald Welte]

Review at  https://gerrit.osmocom.org/2352

netif/ipa.h: Don't redefine 'struct ipaccess_unit' from libosmocore

'struct ipaccess_unit' is defined in libosmocore/gsm/ipa.h, we shouldn't
re-define it here.  This entire IPA code duplication accross multiple
libraries and programs is a big mess.

Change-Id: If378a088c741df540befb928a5557fc62dea954a
---
M include/osmocom/netif/ipa.h
1 file changed, 1 insertion(+), 13 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/52/2352/1

diff --git a/include/osmocom/netif/ipa.h b/include/osmocom/netif/ipa.h
index 8d221e3..0a29f01 100644
--- a/include/osmocom/netif/ipa.h
+++ b/include/osmocom/netif/ipa.h
@@ -2,6 +2,7 @@
 #define _OSMO_NETIF_IPA_H_
 
 #include <osmocom/gsm/protocol/ipaccess.h>
+#include <osmocom/gsm/ipa.h>
 
 /* This is like 'struct ipaccess_head' in libosmocore, but 'ipa_head' is
  * actually the more apropriate name, so rather than making more code
@@ -21,19 +22,6 @@
 void osmo_ipa_msg_push_header(struct msgb *msg, uint8_t proto);
 
 int osmo_ipa_process_msg(struct msgb *msg);
-
-struct ipaccess_unit {
-	uint16_t site_id;
-	uint16_t bts_id;
-	uint16_t trx_id;
-	char *unit_name;
-	char *equipvers;
-	char *swversion;
-	uint8_t mac_addr[6];
-	char *location1;
-	char *location2;
-	char *serno;
-};
 
 struct osmo_fd;
 struct tlv_parsed;

-- 
To view, visit https://gerrit.osmocom.org/2352
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If378a088c741df540befb928a5557fc62dea954a
Gerrit-PatchSet: 1
Gerrit-Project: libosmo-netif
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>