diff options
| author | Matthieu Baerts (NGI0) <matttbe@kernel.org> | 2025-03-14 11:35:51 +0300 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2025-03-14 12:24:14 +0300 |
| commit | a1e36ec36356e33fd089761021e0de031ae3a06a (patch) | |
| tree | c08ffd12a8e3afaac2c1cae2a1a2c6018856f14b /net/lapb/lapb_subr.c | |
| parent | 941defcea7e11ad7ff8f0d4856716dd637d757dd (diff) | |
| download | linux-a1e36ec36356e33fd089761021e0de031ae3a06a.tar.xz | |
selftests: drv-net: fix merge conflicts resolution
After the recent merge between net-next and net, I got some conflicts on
my side because the merge resolution was different from Stephen's one
[1] I applied on my side in the MPTCP tree.
It looks like the code that is now in net-next is using the old way to
retrieve the local and remote addresses. This patch is now using the new
way, like what was in Stephen's email [1].
Also, in get_interface_info(), there were no conflicts in this area,
because that was new code from 'net', but a small adaptation was needed
there as well to get the remote address.
Fixes: 941defcea7e1 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net")
Link: https://lore.kernel.org/20250311115758.17a1d414@canb.auug.org.au [1]
Suggested-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20250314-net-next-drv-net-ping-fix-merge-v1-1-0d5c19daf707@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions