[M] Change in osmo-upf[master]: cosmetic: reduce dup in tunnel struct definitions