diff options
| author | Maxime Ripard <mripard@kernel.org> | 2025-08-20 09:33:06 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2025-08-20 09:33:06 +0200 |
| commit | 1e17ed83261ee7aa80c488461ed0f4e7a4f82660 (patch) | |
| tree | 73367537244fb26830457a89d4b0bd4196860624 /drivers/net/wan/lapbether.c | |
| parent | dab74906423c5a0e41dfd4cefc3758d351ccc51e (diff) | |
| parent | dd489c01c3971778c417630f328460021fc8fc61 (diff) | |
Merge drm/drm-next into drm-misc-next
Bring v6.17-rc2 in to unstuck for-linux-next.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/net/wan/lapbether.c')
| -rw-r--r-- | drivers/net/wan/lapbether.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index 995a7207bdf8..f357a7ac70ac 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c @@ -81,7 +81,7 @@ static struct lapbethdev *lapbeth_get_x25_dev(struct net_device *dev) static __inline__ int dev_is_ethdev(struct net_device *dev) { - return dev->type == ARPHRD_ETHER && strncmp(dev->name, "dummy", 5); + return dev->type == ARPHRD_ETHER && !netdev_need_ops_lock(dev); } /* ------------------------------------------------------------------------ */ |