net: Convert network drivers to use renamed network APIs

Rename network symbols in net drivers to use the renamed network APIs.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

drivers/net/loopback.c

@@ -51,8 +51,8 @@ static void loopback_init(struct net_if *iface)
 			     NET_LINK_DUMMY);
 
 	if (IS_ENABLED(CONFIG_NET_IPV4)) {
-		struct in_addr ipv4_loopback = INADDR_LOOPBACK_INIT;
-		struct in_addr netmask = { { { 255, 0, 0, 0 } } };
+		struct net_in_addr ipv4_loopback = NET_INADDR_LOOPBACK_INIT;
+		struct net_in_addr netmask = { { { 255, 0, 0, 0 } } };
 
 		ifaddr = net_if_ipv4_addr_add(iface, &ipv4_loopback,
 					      NET_ADDR_AUTOCONF, 0);
@@ -64,7 +64,7 @@ static void loopback_init(struct net_if *iface)
 	}
 
 	if (IS_ENABLED(CONFIG_NET_IPV6)) {
-		struct in6_addr ipv6_loopback = IN6ADDR_LOOPBACK_INIT;
+		struct net_in6_addr ipv6_loopback = NET_IN6ADDR_LOOPBACK_INIT;
 
 		ifaddr = net_if_ipv6_addr_add(iface, &ipv6_loopback,
 					      NET_ADDR_AUTOCONF, 0);
@@ -147,7 +147,7 @@ static int loopback_send(const struct device *dev, struct net_pkt *pkt)
 	 * the test to control this remotely.
 	 */
 	if (!COND_CODE_1(CONFIG_NET_TEST, (loopback_dont_swap_addresses), (false))) {
-		if (net_pkt_family(pkt) == AF_INET6) {
+		if (net_pkt_family(pkt) == NET_AF_INET6) {
 			net_ipv6_addr_copy_raw(NET_IPV6_HDR(cloned)->src,
 					       NET_IPV6_HDR(pkt)->dst);
 			net_ipv6_addr_copy_raw(NET_IPV6_HDR(cloned)->dst,

drivers/net/ppp.c

@@ -31,7 +31,6 @@ LOG_MODULE_REGISTER(net_ppp, LOG_LEVEL);
 #include <zephyr/sys/crc.h>
 #include <zephyr/drivers/uart.h>
 #include <zephyr/random/random.h>
-#include <zephyr/posix/net/if_arp.h>
 #include <zephyr/net/ethernet.h>
 #include <zephyr/net/capture.h>
 
@@ -302,7 +301,7 @@ static int ppp_save_byte(struct ppp_driver_context *ppp, uint8_t byte)
 		ppp->pkt = net_pkt_rx_alloc_with_buffer(
 			ppp->iface,
 			CONFIG_NET_BUF_DATA_SIZE,
-			AF_UNSPEC, 0, K_NO_WAIT);
+			NET_AF_UNSPEC, 0, K_NO_WAIT);
 		if (!ppp->pkt) {
 			LOG_ERR("[%p] cannot allocate pkt", ppp);
 			return -ENOMEM;
@@ -326,7 +325,7 @@ static int ppp_save_byte(struct ppp_driver_context *ppp, uint8_t byte)
 	if (ppp->available == 1) {
 		ret = net_pkt_alloc_buffer(ppp->pkt,
 					   CONFIG_NET_BUF_DATA_SIZE + ppp->available,
-					   AF_UNSPEC, K_NO_WAIT);
+					   NET_AF_UNSPEC, K_NO_WAIT);
 		if (ret < 0) {
 			LOG_ERR("[%p] cannot allocate new data buffer", ppp);
 			goto out_of_mem;
@@ -827,9 +826,9 @@ static int ppp_send(const struct device *dev, struct net_pkt *pkt)
 	 * value here.
 	 */
 	if (!net_pkt_is_ppp(pkt)) {
-		if (net_pkt_family(pkt) == AF_INET) {
+		if (net_pkt_family(pkt) == NET_AF_INET) {
 			protocol = htons(PPP_IP);
-		} else if (net_pkt_family(pkt) == AF_INET6) {
+		} else if (net_pkt_family(pkt) == NET_AF_INET6) {
 			protocol = htons(PPP_IPV6);
 		}  else {
 			return -EPROTONOSUPPORT;
@@ -1018,7 +1017,7 @@ static void ppp_iface_init(struct net_if *iface)
 			int ret;
 
 			ret = net_capture_cooked_setup(&ppp_capture_ctx->cooked,
-						       ARPHRD_PPP,
+						       NET_ARPHRD_PPP,
 						       sizeof(ppp->mac_addr),
 						       ppp->mac_addr);
 			if (ret < 0) {

drivers/net/slip.c

@@ -167,11 +167,11 @@ static void process_msg(struct slip_context *slip)
 	{
 		struct net_eth_hdr *hdr = NET_ETH_HDR(pkt);
 
-		if (ntohs(hdr->type) == NET_ETH_PTYPE_VLAN) {
+		if (net_ntohs(hdr->type) == NET_ETH_PTYPE_VLAN) {
 			struct net_eth_vlan_hdr *hdr_vlan =
 				(struct net_eth_vlan_hdr *)NET_ETH_HDR(pkt);
 
-			net_pkt_set_vlan_tci(pkt, ntohs(hdr_vlan->vlan.tci));
+			net_pkt_set_vlan_tci(pkt, net_ntohs(hdr_vlan->vlan.tci));
 			vlan_tag = net_pkt_vlan_tag(pkt);
 		}
 	}