3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-24 16:49:25 +01:00

monitor: put nortnl check into nlmon_print_rtnl

Doing this allows --nortnl to work when reading pcaps.
This commit is contained in:
James Prestwood 2022-10-27 11:18:42 -07:00 committed by Denis Kenzior
parent 342acc9a67
commit 99c0cdfab4

View File

@ -8089,6 +8089,9 @@ void nlmon_print_rtnl(struct nlmon *nlmon, const struct timeval *tv,
int64_t aligned_size = NLMSG_ALIGN(size); int64_t aligned_size = NLMSG_ALIGN(size);
const struct nlmsghdr *nlmsg; const struct nlmsghdr *nlmsg;
if (nlmon->nortnl)
return;
update_time_offset(tv); update_time_offset(tv);
for (nlmsg = data; NLMSG_OK(nlmsg, aligned_size); for (nlmsg = data; NLMSG_OK(nlmsg, aligned_size);
@ -8207,9 +8210,7 @@ static bool nlmon_receive(struct l_io *io, void *user_data)
case NETLINK_ROUTE: case NETLINK_ROUTE:
store_netlink(nlmon, tv, proto_type, nlmsg); store_netlink(nlmon, tv, proto_type, nlmsg);
if (!nlmon->nortnl) nlmon_print_rtnl(nlmon, tv, nlmsg, nlmsg->nlmsg_len);
nlmon_print_rtnl(nlmon, tv, nlmsg,
nlmsg->nlmsg_len);
break; break;
case NETLINK_GENERIC: case NETLINK_GENERIC:
nlmon_message(nlmon, tv, tp, nlmsg); nlmon_message(nlmon, tv, tp, nlmsg);