From 10c0dfabfeb9e3e3f4a513bbd4779f5604729bc4 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Sun, 22 Nov 2020 12:42:15 +0100 Subject: [PATCH] fix up merge issue with queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch --- .../net-have-netpoll-bring-up-dsa-management-interface.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch b/queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch index c653a71a9f5..e60605e1d22 100644 --- a/queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch +++ b/queue-4.4/net-have-netpoll-bring-up-dsa-management-interface.patch @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman rtnl_lock(); - if (np->dev_name) { - struct net *net = current->nsproxy->net_ns; -++ if (np->dev_name) ++ if (np->dev_name) ndev = __dev_get_by_name(net, np->dev_name); - } + -- 2.47.3