Change in libosmocore[master]: gsm: Fix bitfield order in dtap_header

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sat Feb 13 08:05:30 UTC 2021


laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/22880 )

Change subject: gsm: Fix bitfield order in dtap_header
......................................................................

gsm: Fix bitfield order in dtap_header

This bitfield was added later and all osmocom code still uses the old
field contain 1 byte "link_id". There's only one known user of the new
bitfield which only uses it to log the SAPI name in osmocom, so no
logical breakage is expected with this change (other than fixing a log
line).

While at it, fix a typo in comment describing related enum.

Related: SYS#4909
Fixes: 392f607f2d42eb2839ccfc4c1b9e2c7cfaf3bcc2
Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67
---
M include/osmocom/gsm/protocol/gsm_08_08.h
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  fixeria: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmocom/gsm/protocol/gsm_08_08.h b/include/osmocom/gsm/protocol/gsm_08_08.h
index fe7776b..7ef7a29 100644
--- a/include/osmocom/gsm/protocol/gsm_08_08.h
+++ b/include/osmocom/gsm/protocol/gsm_08_08.h
@@ -49,12 +49,12 @@
 		uint8_t link_id;  /* Backward compatibility */
 		struct {
 #if OSMO_IS_LITTLE_ENDIAN
-			uint8_t dlci_cc:2,
+			uint8_t dlci_sapi:3, /* enum gsm0406_dlci_sapi */
 			dlci_spare:3,
-			dlci_sapi:3; /* enum gsm0406_dlc_sapi */
+			dlci_cc:2;
 #elif OSMO_IS_BIG_ENDIAN
 /* auto-generated from the little endian part above (libosmocore/contrib/struct_endianess.py) */
-			uint8_t dlci_sapi:3, dlci_spare:3, dlci_cc:2;
+			uint8_t dlci_cc:2, dlci_spare:3, dlci_sapi:3;
 #endif
 		};
 	};

-- 
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/22880
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I84866f03ee642aa7f1da273c93a16a38234cfa67
Gerrit-Change-Number: 22880
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20210213/5504b110/attachment.htm>


More information about the gerrit-log mailing list