laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-upf/+/30237 )

Change subject: cosmetic: rename upf_gtp_dev_tunnel_* to upf_gtp_dev_tunend_* ......................................................................

cosmetic: rename upf_gtp_dev_tunnel_* to upf_gtp_dev_tunend_*

Change-Id: I73e7b3c4841520909185aaba3ec41c6cf1e3ff51 --- M include/osmocom/upf/upf_gtp.h M src/osmo-upf/up_gtp_action.c M src/osmo-upf/upf_gtp.c 3 files changed, 9 insertions(+), 9 deletions(-)

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

diff --git a/include/osmocom/upf/upf_gtp.h b/include/osmocom/upf/upf_gtp.h index c553730..77ea623 100644 --- a/include/osmocom/upf/upf_gtp.h +++ b/include/osmocom/upf/upf_gtp.h @@ -77,8 +77,8 @@ struct upf_gtp_dev *upf_gtp_dev_find_by_name(const char *name); struct upf_gtp_dev *upf_gtp_dev_first();

-int upf_gtp_dev_tunnel_add(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *t); -int upf_gtp_dev_tunnel_del(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *t); +int upf_gtp_dev_tunend_add(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *t); +int upf_gtp_dev_tunend_del(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *t);

int upf_gtp_dev_to_str_buf(char *buf, size_t buflen, const struct upf_gtp_dev *dev); char *upf_gtp_dev_to_str_c(void *ctx, const struct upf_gtp_dev *dev); diff --git a/src/osmo-upf/up_gtp_action.c b/src/osmo-upf/up_gtp_action.c index 2471a61..81b74b3 100644 --- a/src/osmo-upf/up_gtp_action.c +++ b/src/osmo-upf/up_gtp_action.c @@ -99,9 +99,9 @@ }

if (enable) - rc = upf_gtp_dev_tunnel_add(gtp_dev, &a->tunend); + rc = upf_gtp_dev_tunend_add(gtp_dev, &a->tunend); else - rc = upf_gtp_dev_tunnel_del(gtp_dev, &a->tunend); + rc = upf_gtp_dev_tunend_del(gtp_dev, &a->tunend); if (rc) { LOG_UP_GTP_ACTION(a, LOGL_ERROR, "Failed to %s GTP tunnel: %d %s\n", enable ? "enable" : "disable", rc, strerror(-rc)); diff --git a/src/osmo-upf/upf_gtp.c b/src/osmo-upf/upf_gtp.c index 6794a25..ae1eaf0 100644 --- a/src/osmo-upf/upf_gtp.c +++ b/src/osmo-upf/upf_gtp.c @@ -381,7 +381,7 @@ return rc; }

-static struct upf_gtp_tunend *upf_gtp_dev_tunnel_find(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) +static struct upf_gtp_tunend *upf_gtp_dev_tunend_find(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) { struct upf_gtp_tunend *tun; llist_for_each_entry(tun, &dev->tunnels, entry) { @@ -392,10 +392,10 @@ return NULL; }

-int upf_gtp_dev_tunnel_add(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) +int upf_gtp_dev_tunend_add(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) { struct upf_gtp_tunend *tun; - tun = upf_gtp_dev_tunnel_find(dev, tun_desc); + tun = upf_gtp_dev_tunend_find(dev, tun_desc); if (!tun) tun = upf_gtp_tunend_alloc(dev, tun_desc); if (tun->active) @@ -403,11 +403,11 @@ return upf_gtp_tunend_activate(tun); }

-int upf_gtp_dev_tunnel_del(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) +int upf_gtp_dev_tunend_del(struct upf_gtp_dev *dev, const struct upf_gtp_tunend_desc *tun_desc) { struct upf_gtp_tunend *tun; int rc; - tun = upf_gtp_dev_tunnel_find(dev, tun_desc); + tun = upf_gtp_dev_tunend_find(dev, tun_desc); if (!tun) return 0; if (tun->active) {