From 0d8508474155ca2de39d9fa4ec68e53d856270dc Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 28 Aug 2022 22:59:52 +0800 Subject: [PATCH] wireless/gs2200m: Rename usrsock_request to usrsock_handle_request fix the conflict after usrsock reconstruct: https://github.com/apache/incubator-nuttx/pull/6949 Signed-off-by: Xiang Xiao --- wireless/gs2200m/gs2200m_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wireless/gs2200m/gs2200m_main.c b/wireless/gs2200m/gs2200m_main.c index ee72e1ce6..b53cf97af 100644 --- a/wireless/gs2200m/gs2200m_main.c +++ b/wireless/gs2200m/gs2200m_main.c @@ -378,10 +378,10 @@ read_req(int fd, FAR const struct usrsock_request_common_s *com_hdr, } /**************************************************************************** - * Name: usrsock_request + * Name: usrsock_handle_request ****************************************************************************/ -static int usrsock_request(int fd, FAR struct gs2200m_s *priv) +static int usrsock_handle_request(int fd, FAR struct gs2200m_s *priv) { FAR struct usrsock_request_common_s *com_hdr; union usrsock_request_u req; @@ -1675,7 +1675,7 @@ static int gs2200m_loop(FAR struct gs2200m_s *priv) if (fds[0].revents & POLLIN) { - ret = usrsock_request(fd[0], priv); + ret = usrsock_handle_request(fd[0], priv); ASSERT(0 == ret); }