You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/10/15 10:34:15 UTC
[incubator-nuttx] 02/02: net/ioctl/cellular: remove redundant logic
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 85440f5db6a8de75159360f067456a38870b941b
Author: chao an <an...@xiaomi.com>
AuthorDate: Sat Oct 15 14:20:59 2022 +0800
net/ioctl/cellular: remove redundant logic
Signed-off-by: chao an <an...@xiaomi.com>
---
net/netdev/netdev_ioctl.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/net/netdev/netdev_ioctl.c b/net/netdev/netdev_ioctl.c
index 9896d9eb50..da189c90c9 100644
--- a/net/netdev/netdev_ioctl.c
+++ b/net/netdev/netdev_ioctl.c
@@ -660,6 +660,7 @@ static ssize_t net_ioctl_ifreq_arglen(int cmd)
case SIOCDCANEXTFILTER:
case SIOCACANSTDFILTER:
case SIOCDCANSTDFILTER:
+ case SIOCSCELLNETDEV:
case SIOCGIFNAME:
case SIOCGIFINDEX:
return sizeof(struct ifreq);
@@ -1055,16 +1056,17 @@ static int netdev_ifr_ioctl(FAR struct socket *psock, int cmd,
#if defined(CONFIG_NETDEV_IOCTL) && defined(CONFIG_NET_CELLULAR)
case SIOCSCELLNETDEV: /* set params for cellular network devices */
- {
- dev = netdev_findbyname(req->ifr_name);
- if (dev && dev->d_ioctl)
- {
- FAR struct cell_ioctl_data_s *cell_netdev_data =
- &req->ifr_ifru.ifru_cell_data;
- ret = dev->d_ioctl(dev, cmd,
- (unsigned long)(uintptr_t)cell_netdev_data);
- }
- }
+ if (dev->d_ioctl)
+ {
+ FAR struct cell_ioctl_data_s *cell_netdev_data =
+ &req->ifr_ifru.ifru_cell_data;
+ ret = dev->d_ioctl(dev, cmd,
+ (unsigned long)(uintptr_t)cell_netdev_data);
+ }
+ else
+ {
+ ret = -ENOSYS;
+ }
break;
#endif