diff --git a/include/nuttx/net/net.h b/include/nuttx/net/net.h index e86ebadb3306c..0d1f230de8d04 100644 --- a/include/nuttx/net/net.h +++ b/include/nuttx/net/net.h @@ -466,18 +466,6 @@ int net_lockedwait_uninterruptible(sem_t *sem); FAR struct iob_s *net_ioballoc(bool throttled, enum iob_user_e consumerid); #endif -/**************************************************************************** - * Name: net_setipid - * - * Description: - * This function may be used at boot time to set the initial ip_id. - * - * Assumptions: - * - ****************************************************************************/ - -void net_setipid(uint16_t id); - /**************************************************************************** * Name: net_checksd * diff --git a/net/inet/Make.defs b/net/inet/Make.defs index 07895886f82a1..980db1bf49a4c 100644 --- a/net/inet/Make.defs +++ b/net/inet/Make.defs @@ -47,7 +47,6 @@ endif ifeq ($(CONFIG_NET_IPv4),y) SOCK_CSRCS += ipv4_setsockopt.c ipv4_getsockname.c ipv4_getpeername.c -SOCK_CSRCS += inet_setipid.c endif ifeq ($(CONFIG_NET_IPv6),y) diff --git a/net/inet/inet.h b/net/inet/inet.h index 154f149c2c1a0..54adbde77476a 100644 --- a/net/inet/inet.h +++ b/net/inet/inet.h @@ -129,18 +129,6 @@ struct tcp_conn_s; /* Forward reference */ #endif struct socket; /* Forward reference */ -/**************************************************************************** - * Name: inet_setipid - * - * Description: - * This function may be used at boot time to set the initial ip_id. - * - * Assumptions: - * - ****************************************************************************/ - -void inet_setipid(uint16_t id); - /**************************************************************************** * Name: inet_sockif * @@ -159,7 +147,7 @@ void inet_setipid(uint16_t id); ****************************************************************************/ FAR const struct sock_intf_s * - inet_sockif(sa_family_t family, int type, int protocol); +inet_sockif(sa_family_t family, int type, int protocol); /**************************************************************************** * Name: ipv4_setsockopt and ipv6_setsockopt diff --git a/net/inet/inet_setipid.c b/net/inet/inet_setipid.c deleted file mode 100644 index 16ce2c111f7dc..0000000000000 --- a/net/inet/inet_setipid.c +++ /dev/null @@ -1,67 +0,0 @@ -/**************************************************************************** - * net/inet/net_setipid.c - * - * Copyright (C) 2007, 2009, 2017 Gregory Nutt. All rights reserved. - * Author: Gregory Nutt - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include -#ifdef CONFIG_NET - -#include -#include - -#include "inet/inet.h" - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: inet_setipid - * - * Description: - * This function may be used at boot time to set the initial ip_id. - * - * Assumptions: - * - ****************************************************************************/ - -void inet_setipid(uint16_t id) -{ - g_ipid = id; -} - -#endif /* CONFIG_NET */