michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: ip: net_if: consistent interface id logging

Browse source 
Update logging to consistently refer to interfaces by their ID, instead
of a mix of IDs and pointers.

Signed-off-by: Jordan Yates <jordan@embeint.com>
This commit is contained in:
Jordan Yates 2025-04-22 20:37:00 +10:00 • committed by Benjamin Cabé
commit 1c2fc02cf2
1 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

29
subsys/net/ip/net_if.c
View file

@ -302,7 +302,7 @@ static bool net_if_tx(struct net_if *iface, struct net_pkt *pkt)
} else { } else {
/* Drop packet if interface is not up */ /* Drop packet if interface is not up */
NET_WARN("iface %p is down", iface); NET_WARN("iface %d is down", net_if_get_by_iface(iface));
status = -ENETDOWN; status = -ENETDOWN;
} }
@ -438,7 +438,7 @@ static inline void init_iface(struct net_if *iface)
net_virtual_init(iface); net_virtual_init(iface);
NET_DBG("On iface %p", iface); NET_DBG("On iface %d", net_if_get_by_iface(iface));
#ifdef CONFIG_USERSPACE #ifdef CONFIG_USERSPACE
k_object_init(iface); k_object_init(iface);
@ -465,7 +465,7 @@ enum net_verdict net_if_try_send_data(struct net_if *iface, struct net_pkt *pkt,
if (!net_if_flag_is_set(iface, NET_IF_LOWER_UP) || if (!net_if_flag_is_set(iface, NET_IF_LOWER_UP) ||
net_if_flag_is_set(iface, NET_IF_SUSPENDED)) { net_if_flag_is_set(iface, NET_IF_SUSPENDED)) {
/* Drop packet if interface is not up */ /* Drop packet if interface is not up */
NET_WARN("iface %p is down", iface); NET_WARN("iface %d is down", net_if_get_by_iface(iface));
verdict = NET_DROP; verdict = NET_DROP;
status = -ENETDOWN; status = -ENETDOWN;
goto done; goto done;
@ -478,14 +478,15 @@ enum net_verdict net_if_try_send_data(struct net_if *iface, struct net_pkt *pkt,
l2 = net_if_l2(iface); l2 = net_if_l2(iface);
if (l2 == NULL) { if (l2 == NULL) {
/* Offloaded ifaces may choose not to use an L2 at all. */ /* Offloaded ifaces may choose not to use an L2 at all. */
NET_WARN("no l2 for iface %p, discard pkt", iface); NET_WARN("no l2 for iface %d, discard pkt", net_if_get_by_iface(iface));
verdict = NET_DROP; verdict = NET_DROP;
goto done; goto done;
} else if (l2->send == NULL) { } else if (l2->send == NULL) {
/* Or, their chosen L2 (for example, OFFLOADED_NETDEV_L2) /* Or, their chosen L2 (for example, OFFLOADED_NETDEV_L2)
* might simply not implement send. * might simply not implement send.
*/ */
NET_WARN("l2 for iface %p cannot send, discard pkt", iface); NET_WARN("l2 for iface %d cannot send, discard pkt",
net_if_get_by_iface(iface));
verdict = NET_DROP; verdict = NET_DROP;
goto done; goto done;
} }
@ -1339,7 +1340,7 @@ void net_if_start_dad(struct net_if *iface)
net_if_lock(iface); net_if_lock(iface);
NET_DBG("Starting DAD for iface %p", iface); NET_DBG("Starting DAD for iface %d", net_if_get_by_iface(iface));
ret = net_if_config_ipv6_get(iface, &ipv6); ret = net_if_config_ipv6_get(iface, &ipv6);
if (ret < 0) { if (ret < 0) {
@ -1532,8 +1533,8 @@ static void rs_timeout(struct k_work *work)
} }
if (iface) { if (iface) {
NET_DBG("RS no respond iface %p count %d", NET_DBG("RS no respond iface %d count %d",
iface, ipv6->rs_count); net_if_get_by_iface(iface), ipv6->rs_count);
if (ipv6->rs_count < RS_COUNT) { if (ipv6->rs_count < RS_COUNT) {
net_if_start_rs(iface); net_if_start_rs(iface);
} }
@ -1560,7 +1561,7 @@ void net_if_start_rs(struct net_if *iface)
net_if_unlock(iface); net_if_unlock(iface);
NET_DBG("Starting ND/RS for iface %p", iface); NET_DBG("Starting ND/RS for iface %d", net_if_get_by_iface(iface));
if (!net_ipv6_start_rs(iface)) { if (!net_ipv6_start_rs(iface)) {
ipv6->rs_start = k_uptime_get_32(); ipv6->rs_start = k_uptime_get_32();
@ -1591,7 +1592,7 @@ void net_if_stop_rs(struct net_if *iface)
goto out; goto out;
} }
NET_DBG("Stopping ND/RS for iface %p", iface); NET_DBG("Stopping ND/RS for iface %d", net_if_get_by_iface(iface));
k_mutex_lock(&lock, K_FOREVER); k_mutex_lock(&lock, K_FOREVER);
sys_slist_find_and_remove(&active_rs_timers, &ipv6->rs_node); sys_slist_find_and_remove(&active_rs_timers, &ipv6->rs_node);
@ -4357,9 +4358,9 @@ void net_if_ipv4_start_acd(struct net_if *iface, struct net_if_addr *ifaddr)
net_sprint_ipv4_addr(&ifaddr->address.in_addr)); net_sprint_ipv4_addr(&ifaddr->address.in_addr));
if (net_ipv4_acd_start(iface, ifaddr) != 0) { if (net_ipv4_acd_start(iface, ifaddr) != 0) {
NET_DBG("Failed to start ACD for %s on iface %p.", NET_DBG("Failed to start ACD for %s on iface %d.",
net_sprint_ipv4_addr(&ifaddr->address.in_addr), net_sprint_ipv4_addr(&ifaddr->address.in_addr),
iface); net_if_get_by_iface(iface));
/* Just act as if no conflict was detected. */ /* Just act as if no conflict was detected. */
net_if_ipv4_acd_succeeded(iface, ifaddr); net_if_ipv4_acd_succeeded(iface, ifaddr);
@ -4379,7 +4380,7 @@ void net_if_start_acd(struct net_if *iface)
net_if_lock(iface); net_if_lock(iface);
NET_DBG("Starting ACD for iface %p", iface); NET_DBG("Starting ACD for iface %d", net_if_get_by_iface(iface));
ret = net_if_config_ipv4_get(iface, &ipv4); ret = net_if_config_ipv4_get(iface, &ipv4);
if (ret < 0) { if (ret < 0) {
@ -5835,7 +5836,7 @@ int net_if_down(struct net_if *iface)
{ {
int status = 0; int status = 0;
NET_DBG("iface %p", iface); NET_DBG("iface %d", net_if_get_by_iface(iface));
net_if_lock(iface); net_if_lock(iface);