frame_relay, gprs_ns2_fr: Fix log messages, remove unused struct

Fix typo and remove any reference to GRE from gprs_ns2_fr.c.
GRE code is in gprs_ns2_frgre.c

Change-Id: I51c756f3c9d918552591bf87861cb4799721ac37
This commit is contained in:
Daniel Willmann 2021-10-26 16:15:51 +02:00
parent 334cf8759f
commit 1f666e875d
2 changed files with 3 additions and 8 deletions

View File

@ -652,7 +652,7 @@ static int rx_lmi_q933_status(struct msgb *msg, struct tlv_parsed *tp)
/* check for mandatory IEs */
if (!TLVP_PRES_LEN(tp, Q933_IEI_REPORT_TYPE, 1)) {
LOGPFRL(link, LOGL_NOTICE, "Rx STATUSL: Missing TLV Q933 Report Type\n");
LOGPFRL(link, LOGL_NOTICE, "Rx STATUS: Missing TLV Q933 Report Type\n");
return -1;
}

View File

@ -83,11 +83,6 @@
/* nanoseconds per bit (504) */
#define BIT_DURATION_NS (1000000000 / SUPERCHANNEL_LINERATE)
struct gre_hdr {
uint16_t flags;
uint16_t ptype;
} __attribute__ ((packed));
static void free_bind(struct gprs_ns2_vc_bind *bind);
static int fr_dlci_rx_cb(void *cb_data, struct msgb *msg);
@ -256,13 +251,13 @@ static int fr_netif_ofd_cb(struct osmo_fd *bfd, uint32_t what)
if (!(what & OSMO_FD_READ))
return 0;
msg = msgb_alloc(NS_ALLOC_SIZE, "Gb/NS/FR/GRE Rx");
msg = msgb_alloc(NS_ALLOC_SIZE, "Gb/NS/FR Rx");
if (!msg)
return -ENOMEM;
rc = recvfrom(bfd->fd, msg->data, NS_ALLOC_SIZE, 0, (struct sockaddr *)&sll, &sll_len);
if (rc < 0) {
LOGBIND(bind, LOGL_ERROR, "recv error %s during NS-FR-GRE recv\n", strerror(errno));
LOGBIND(bind, LOGL_ERROR, "recv error %s during NS-FR recv\n", strerror(errno));
goto out_err;
} else if (rc == 0) {
goto out_err;