Skip to content

Commit c53d483

Browse files
jukkarnashif
authored andcommitted
net: sockets: Do not hijack k_fifo API name
The k_fifo_ prefix is meant for kernel API functions, and not to our socket helper. So remove the k_ prefix in order to avoid confusion. Signed-off-by: Jukka Rissanen <[email protected]>
1 parent 20a51b4 commit c53d483

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

subsys/net/lib/sockets/sockets.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ static void zsock_received_cb(struct net_context *ctx,
117117
int status,
118118
void *user_data);
119119

120-
static inline int k_fifo_wait_non_empty(struct k_fifo *fifo,
121-
k_timeout_t timeout)
120+
static int fifo_wait_non_empty(struct k_fifo *fifo, k_timeout_t timeout)
122121
{
123122
struct k_poll_event events[] = {
124123
K_POLL_EVENT_INITIALIZER(K_POLL_TYPE_FIFO_DATA_AVAILABLE,
@@ -1014,7 +1013,7 @@ static inline ssize_t zsock_recv_dgram(struct net_context *ctx,
10141013
if (flags & ZSOCK_MSG_PEEK) {
10151014
int res;
10161015

1017-
res = k_fifo_wait_non_empty(&ctx->recv_q, timeout);
1016+
res = fifo_wait_non_empty(&ctx->recv_q, timeout);
10181017
/* EAGAIN when timeout expired, EINTR when cancelled */
10191018
if (res && res != -EAGAIN && res != -EINTR) {
10201019
errno = -res;

0 commit comments

Comments
 (0)