From bb77c9d6cc6c1353817629f45b1414c9b0668b39 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Fri, 30 Apr 2010 14:26:12 +0200 Subject: msgb: remove smsh, llch, tlli and gmmh This is a lot of GSM/GPRS specific stuff in struct msgb which we want to avoid. The 'control buffer' will replace them. --- include/osmocore/msgb.h | 13 ++----------- src/msgb.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/include/osmocore/msgb.h b/include/osmocore/msgb.h index 31e54dcd..61c224fe 100644 --- a/include/osmocore/msgb.h +++ b/include/osmocore/msgb.h @@ -36,17 +36,8 @@ struct msgb { unsigned char *l2h; /* the layer 3 header. For OML: FOM; RSL: 04.08; GPRS: BSSGP */ unsigned char *l3h; - /* the layer 4 header */ - union { - unsigned char *smsh; - unsigned char *llch; - unsigned char *l4h; - }; - - /* the layer 5 header, GPRS: GMM header */ - unsigned char *gmmh; - uint32_t tlli; + unsigned char *l4h; uint16_t data_len; uint16_t len; @@ -66,7 +57,7 @@ extern void msgb_reset(struct msgb *m); #define msgb_l1(m) ((void *)(m->l1h)) #define msgb_l2(m) ((void *)(m->l2h)) #define msgb_l3(m) ((void *)(m->l3h)) -#define msgb_sms(m) ((void *)(m->smsh)) +#define msgb_sms(m) ((void *)(m->l4h)) static inline unsigned int msgb_l1len(const struct msgb *msgb) { diff --git a/src/msgb.c b/src/msgb.c index aea92d44..9117a0ad 100644 --- a/src/msgb.c +++ b/src/msgb.c @@ -84,5 +84,5 @@ void msgb_reset(struct msgb *msg) msg->lchan = NULL; msg->l2h = NULL; msg->l3h = NULL; - msg->smsh = NULL; + msg->l4h = NULL; } -- cgit v1.2.3