diff options
| author | Harald Welte <laforge@gnumonks.org> | 2017-04-15 16:06:56 +0200 |
|---|---|---|
| committer | Harald Welte <laforge@gnumonks.org> | 2017-04-15 16:06:56 +0200 |
| commit | d8348ddafca54eee7cc001abf49be63db138b4cf (patch) | |
| tree | 8ebc66069aae53f234c54e3fa3a0f6d61312f915 | |
| parent | 719d1a38c67afb5e896d35bccb2cc3f922872ec8 (diff) | |
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
| -rw-r--r-- | include/osmocom/netif/ipa.h | 14 |
1 files changed, 1 insertions, 13 deletions
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 @@ -22,19 +23,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; |