diff options
author | Jiri Kosina <jkosina@suse.com> | 2025-07-31 22:36:25 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.com> | 2025-07-31 22:36:25 +0200 |
commit | e9ef810dfee7a2227da9d423aecb0ced35faddbe (patch) | |
tree | 52befbbbeacbd9340f90884dee840be3f492d3e1 /net/tipc/monitor.c | |
parent | 3a1d22bd85381c4e358fc3340e776c3a3223a1d0 (diff) | |
parent | 3a807f3ff9eaaeead81576c5a72d226d519a2fe7 (diff) |
Merge branch 'for-6.17/amd-sfh' into for-linus
- add support for operating modes (Basavaraj Natikar)
Diffstat (limited to 'net/tipc/monitor.c')
-rw-r--r-- | net/tipc/monitor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c index b45c5b91bc7a..572b79bf76ce 100644 --- a/net/tipc/monitor.c +++ b/net/tipc/monitor.c @@ -630,7 +630,7 @@ void tipc_mon_get_state(struct net *net, u32 addr, static void mon_timeout(struct timer_list *t) { - struct tipc_monitor *mon = from_timer(mon, t, timer); + struct tipc_monitor *mon = timer_container_of(mon, t, timer); struct tipc_peer *self; int best_member_cnt = dom_size(mon->peer_cnt) - 1; |